summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2015-12-09 21:15:31 -0600
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-12-12 07:18:55 +0700
commitc6b4e9d94c6df98325104fa02b60372d47523b0f (patch)
tree53e6f5392f9614f42f4f32ec9eb43002bf5a07b7
parente158655c9867ccbf234e8f28bd15e0bbcf87f235 (diff)
downloadslackbuilds-c6b4e9d94c6df98325104fa02b60372d47523b0f.tar.gz
games/warsow: Hardcoded x86 ARCH to i686
This fixes an apparent bug reported by notpacman on IRC: Linking C executable ../build/warsow.i686 [100%] Built target warsow chmod: cannot access 'usr/share/warsow/warsow.i486': No such file or directory Without ARCH set, our build script defaults to ARCH=i486 and thus expects the name to build warsow.i486, but apparently upstream hardcodes it to be warsow.i686, so let's fix that. Nobody plays this sort of game on a 486 anyway, right? Right? :-) Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--games/warsow/warsow.SlackBuild15
1 files changed, 5 insertions, 10 deletions
diff --git a/games/warsow/warsow.SlackBuild b/games/warsow/warsow.SlackBuild
index 612f180934..762adc43c2 100644
--- a/games/warsow/warsow.SlackBuild
+++ b/games/warsow/warsow.SlackBuild
@@ -25,26 +25,21 @@
PRGNAM=warsow
VERSION=${VERSION:-2.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+case "$( uname -m )" in
+ i?86) ARCH=i686 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
- esac
-fi
+esac
TMP=${TMP:-/tmp/SBo}
CWD=$(pwd)
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
+if [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then