summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:49 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:49 -0400
commit1f69c19fa2a87f248864311a9a5021fcc2a16b71 (patch)
treef356b25174f9679c4dafbf039f554177a29c2378
parente62a2696b728ebd65167ca403080701ce592ecd1 (diff)
downloadslackbuilds-1f69c19fa2a87f248864311a9a5021fcc2a16b71.tar.gz
libraries/DevIL: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/DevIL/DevIL.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/DevIL/DevIL.SlackBuild b/libraries/DevIL/DevIL.SlackBuild
index cd3d7ca30f..5123622278 100644
--- a/libraries/DevIL/DevIL.SlackBuild
+++ b/libraries/DevIL/DevIL.SlackBuild
@@ -7,10 +7,19 @@
PRGNAM=DevIL
VERSION=${VERSION:-1.6.8}
PKG_VERSION=${VERSION}_rc2
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e