aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:56 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:56 -0400
commitf3c461c59275206366cbb34c464881cd4c0547ea (patch)
tree50d53b86f2bc06fff751c0f1feb264382af21390
parent6778727bcc6cac0dac448d05d78d5f95219f65ba (diff)
system/tokyotyrant: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/tokyotyrant/tokyotyrant.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/tokyotyrant/tokyotyrant.SlackBuild b/system/tokyotyrant/tokyotyrant.SlackBuild
index eaa6149311ce..5371a02bb4ee 100644
--- a/system/tokyotyrant/tokyotyrant.SlackBuild
+++ b/system/tokyotyrant/tokyotyrant.SlackBuild
@@ -5,10 +5,19 @@
PRGNAM=tokyotyrant
VERSION=${VERSION:-1.1.40}
-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
@@ -23,6 +32,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e