aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:14 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:14 -0400
commit59b663818ad8061917c723faab30d2eb038aa538 (patch)
tree94555acdb2154d7f0cef665367aac3271da96244
parent0a12f2e082a9dc20d93ac88539bf625add57dd85 (diff)
system/cage: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/cage/cage.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/cage/cage.SlackBuild b/system/cage/cage.SlackBuild
index 621f9da4a08c..02661f5533ae 100644
--- a/system/cage/cage.SlackBuild
+++ b/system/cage/cage.SlackBuild
@@ -10,10 +10,19 @@
PRGNAM=cage
VERSION=${VERSION:-0.80}
-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
@@ -28,6 +37,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors