summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:34 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:34 -0400
commit9e963aff9e92acc08637bbeb3151baff139de836 (patch)
tree203e79a1338a06d2daeb34d4f196bbbd689b4e91
parent37de0ec7b286c0b4114ff0b14729999c514293c6 (diff)
downloadslackbuilds-9e963aff9e92acc08637bbeb3151baff139de836.tar.gz
libraries/webkit: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/webkit/webkit.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/webkit/webkit.SlackBuild b/libraries/webkit/webkit.SlackBuild
index 537c68a168..56bc549ef7 100644
--- a/libraries/webkit/webkit.SlackBuild
+++ b/libraries/webkit/webkit.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=webkit
VERSION=r45012
-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
@@ -45,6 +54,9 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
rm -rf $PKG