summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Bernardini <matteo.bernardini@sns.it>2010-05-29 18:09:58 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-06-01 00:45:32 -0500
commit9a557a6a274d14a7c022afe60fda5a3bcbe8d222 (patch)
tree22b855f1c18cedcb827e4d5fc0437084744a9f65
parent75587056c5010c4b4bfd0100fd1d2c4ab3f7738a (diff)
downloadslackbuilds-9a557a6a274d14a7c022afe60fda5a3bcbe8d222.tar.gz
network/hping3: miscellaneous cleanups
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--network/hping3/hping3.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/network/hping3/hping3.SlackBuild b/network/hping3/hping3.SlackBuild
index 06b3c93ac6..a80574dfec 100644
--- a/network/hping3/hping3.SlackBuild
+++ b/network/hping3/hping3.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=hping3
VERSION=${VERSION:-20051105}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
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
@@ -45,6 +54,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e