summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:13 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:13 -0400
commit0a12f2e082a9dc20d93ac88539bf625add57dd85 (patch)
tree2b603ccaecb6e419dacdd38ba4174bb6f163fab8
parent4ceb17b6f88bef283edae92a97ea7238a9c55446 (diff)
downloadslackbuilds-0a12f2e082a9dc20d93ac88539bf625add57dd85.tar.gz
system/bonnie++: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/bonnie++/bonnie++.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/bonnie++/bonnie++.SlackBuild b/system/bonnie++/bonnie++.SlackBuild
index ed2a099c81..cd1fcbfc31 100644
--- a/system/bonnie++/bonnie++.SlackBuild
+++ b/system/bonnie++/bonnie++.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=bonnie++
VERSION=1.03e
-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
@@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e