aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:03:34 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:03:34 -0400
commit745be0e673bb11930f8b1885f3d5813756801f00 (patch)
treefd494b3e36c37f9b9f6a2d6975c96eef6bdaf253
parentc9e07058216b93b2a81b0514ed5e3e8329610f65 (diff)
development/qjson: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rwxr-xr-xdevelopment/qjson/qjson.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/development/qjson/qjson.SlackBuild b/development/qjson/qjson.SlackBuild
index 9e93e94a45ebd..ee32b03018b67 100755
--- a/development/qjson/qjson.SlackBuild
+++ b/development/qjson/qjson.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=qjson
VERSION=${VERSION:-0.7.1}
-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