summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:08:08 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:08:08 -0400
commitd4a9d94b220e90d948bfc3e2fae956748736cc3f (patch)
treea17ea1b88f2ee11508913a2a8a4bd4aed0c49de6
parentd2a4f93a162053ccc694c476e77d736e44e052a6 (diff)
downloadslackbuilds-d4a9d94b220e90d948bfc3e2fae956748736cc3f.tar.gz
libraries/libjpeg-turbo: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild b/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild
index bc988a72e1..4f72f9eed0 100644
--- a/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild
+++ b/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=libjpeg-turbo
VERSION=${VERSION:-0.0.91}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
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
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e