summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:09:01 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:09:01 -0400
commit282fa94dd7c9335da52f86b8abf70a6bb42ffba4 (patch)
tree81c5a9388af76052f66e2dfd33fae5d61c09f390
parenta240a3333946bbee2d8068d6dc2244b56bd75f11 (diff)
downloadslackbuilds-282fa94dd7c9335da52f86b8abf70a6bb42ffba4.tar.gz
libraries/libwpg: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/libwpg/libwpg.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/libwpg/libwpg.SlackBuild b/libraries/libwpg/libwpg.SlackBuild
index bca8c1e4fa..f66c3da496 100644
--- a/libraries/libwpg/libwpg.SlackBuild
+++ b/libraries/libwpg/libwpg.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=libwpg
VERSION=0.1.3
-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 -e