summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:36 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:36 -0400
commitd6d1658960a0a786223d3f72a2780f8decb82ea2 (patch)
tree1f7940eee8052c87dd1a04479468601c26a2b630
parentfa70ea7e3754d3d0b04e00fd43919b2b43ad25e5 (diff)
downloadslackbuilds-d6d1658960a0a786223d3f72a2780f8decb82ea2.tar.gz
libraries/wxX11: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/wxX11/wxX11.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/wxX11/wxX11.SlackBuild b/libraries/wxX11/wxX11.SlackBuild
index 74f44102b3..51576853fc 100644
--- a/libraries/wxX11/wxX11.SlackBuild
+++ b/libraries/wxX11/wxX11.SlackBuild
@@ -4,10 +4,19 @@
PRGNAM=wxX11
VERSION=2.8.7
-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
@@ -22,6 +31,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