From 108094b1a3e203115e7f5ae1e9c51e10bbb4cdcc Mon Sep 17 00:00:00 2001
From: "Ryan P.C. McQuen" <ryanpcmcquen@member.fsf.org>
Date: Mon, 16 Jan 2017 07:01:06 -0800
Subject: desktop/dwm: Fix compiler options. i486 => i586.

Signed-off-by: Ryan P.C. McQuen <ryanpcmcquen@member.fsf.org>
---
 desktop/dwm/dwm.SlackBuild | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'desktop/dwm')

diff --git a/desktop/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild
index 1da1171442..38c6b69c53 100644
--- a/desktop/dwm/dwm.SlackBuild
+++ b/desktop/dwm/dwm.SlackBuild
@@ -34,12 +34,12 @@
 
 PRGNAM=dwm
 VERSION=${VERSION:-6.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -50,8 +50,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -90,6 +90,12 @@ find -L . \
 #  patch -p0 < $CWD/patches/$i
 #done
 
+## Fix options for our compilers,
+## thanks to Brenton Earl.
+sed -i \
+  -e "s,-D_BSD_SOURCE,-D_DEFAULT_SOURCE," \
+  -e "s,-Os,$SLKCFLAGS," \
+  config.mk
 
 make \
   OPTS="$SLKCFLAGS" \
-- 
cgit v1.2.3