summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:22 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:10:22 -0400
commitf6dda9ce68134b11fd2898ca8f7bf380cdc67bc2 (patch)
tree59322710840b77e786ca5756da4be7cec79796b4
parenteb696f275a2a6159e497e2392aa1a5e94ad0e09e (diff)
downloadslackbuilds-f6dda9ce68134b11fd2898ca8f7bf380cdc67bc2.tar.gz
libraries/rhino: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/rhino/rhino.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/rhino/rhino.SlackBuild b/libraries/rhino/rhino.SlackBuild
index 6d5f67f9f1..b8bfe1d0a7 100644
--- a/libraries/rhino/rhino.SlackBuild
+++ b/libraries/rhino/rhino.SlackBuild
@@ -5,10 +5,19 @@
PRGNAM=rhino
VERSION=1_7R2
-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
@@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e