aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:08:13 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:08:13 -0400
commite0b7b26e65321e7f5697c8ea7d07d81bb137a1a2 (patch)
treedbe0f5eeee48ab5049dde298b62400853d4d57fa
parent7e97b7b0b053602d482f52222cc1a56e67700dde (diff)
libraries/libmatchbox: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/libmatchbox/libmatchbox.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/libmatchbox/libmatchbox.SlackBuild b/libraries/libmatchbox/libmatchbox.SlackBuild
index ab2f218415c2..9a1c68793ea2 100644
--- a/libraries/libmatchbox/libmatchbox.SlackBuild
+++ b/libraries/libmatchbox/libmatchbox.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=libmatchbox
VERSION=1.9
-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) 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 -e # Exit on most errors