aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-23 02:22:51 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:44 -0500
commit200760d4ab53bf507a4247aac83c623200bd07ae (patch)
tree1df0f514fa4b832e9343bbb81e6a6154c54d4dfa
parent03bf2725a98e324965eeb4163e9314ffa083bb85 (diff)
libraries/imlib2: Miscellaneous cleanups.
-rw-r--r--libraries/imlib2/imlib2.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/imlib2/imlib2.SlackBuild b/libraries/imlib2/imlib2.SlackBuild
index 4fdc039046dc..ba262bbde5d2 100644
--- a/libraries/imlib2/imlib2.SlackBuild
+++ b/libraries/imlib2/imlib2.SlackBuild
@@ -26,10 +26,19 @@
PRGNAM=imlib2
VERSION=1.4.2
-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) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e