summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:13:03 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:13:03 -0400
commit613783e08a12baa94be27b750a1c0f21cdd89844 (patch)
tree4a5507a8b9c0ea35ec30b9cc7f0993b107ae3029 /network
parented3667f3dd17a368b06f4b950b5982c0043e6e5a (diff)
downloadslackbuilds-613783e08a12baa94be27b750a1c0f21cdd89844.tar.gz
network/js: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/js/js.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/network/js/js.SlackBuild b/network/js/js.SlackBuild
index 5e6ceedbde..0576867bbe 100644
--- a/network/js/js.SlackBuild
+++ b/network/js/js.SlackBuild
@@ -11,12 +11,21 @@
PRGNAM=js
VERSION=${VERSION:-1.8.0_rc1}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
SRC_VERSION=$(echo $VERSION | tr _ -)
+# 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
@@ -31,6 +40,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
CFLAGS="$SLKCFLAGS"