summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:07:17 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:07:17 -0400
commitc8c5fa63153cbfe7f047e618669787c0d5e93c58 (patch)
tree0cb5ad9b61b2fd15abb3c8bca415a2a245ed5820
parent571f90ea4eb847167819acb8bf5b7d6d8be1fe2c (diff)
downloadslackbuilds-c8c5fa63153cbfe7f047e618669787c0d5e93c58.tar.gz
libraries/json-glib: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/json-glib/json-glib.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/json-glib/json-glib.SlackBuild b/libraries/json-glib/json-glib.SlackBuild
index c94353fb33..9dcbd87001 100644
--- a/libraries/json-glib/json-glib.SlackBuild
+++ b/libraries/json-glib/json-glib.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=json-glib
VERSION=0.7.6
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -eu