summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:40 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:40 -0400
commit580eeac6552bc51879d9c7feec21cec1f482d982 (patch)
treebcc0e94d09fae6b074fe2060a6b6bbcc48f41a5e
parent27c45f2c01de4b5095720c41d93be97325dd6e1b (diff)
downloadslackbuilds-580eeac6552bc51879d9c7feec21cec1f482d982.tar.gz
libraries/xforms: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/xforms/xforms.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/xforms/xforms.SlackBuild b/libraries/xforms/xforms.SlackBuild
index 56a7106647..bdcde88a4a 100644
--- a/libraries/xforms/xforms.SlackBuild
+++ b/libraries/xforms/xforms.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=xforms
VERSION=${VERSION:-1.0.92sp2}
-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
@@ -47,6 +56,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