summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:13:00 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:13:00 -0400
commit4c04222d5fae039b9dbe6d946a39627bff8d465a (patch)
treefd20358b70a756d00ad2556db788c367b26a65a5
parente03d4148f9d0f7f7c51e93f22759794876b85841 (diff)
downloadslackbuilds-4c04222d5fae039b9dbe6d946a39627bff8d465a.tar.gz
slackbuilds-4c04222d5fae039b9dbe6d946a39627bff8d465a.tar.xz
network/iperf: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--network/iperf/iperf.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/network/iperf/iperf.SlackBuild b/network/iperf/iperf.SlackBuild
index 7a4bab5480..b05c262895 100644
--- a/network/iperf/iperf.SlackBuild
+++ b/network/iperf/iperf.SlackBuild
@@ -8,10 +8,19 @@
PRGNAM=iperf
VERSION=${VERSION:-2.0.4}
-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
@@ -26,6 +35,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e