summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:12:53 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:12:53 -0400
commita7ec9a927b5a32bf92c644840ebc5a36d1101d0e (patch)
tree4f2645bffade57e4469c4c4de232316cb0834ce5
parent78a4ae6a069d875dc591c1374bf387d22f4c8a2b (diff)
downloadslackbuilds-a7ec9a927b5a32bf92c644840ebc5a36d1101d0e.tar.gz
network/haproxy: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--network/haproxy/haproxy.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/network/haproxy/haproxy.SlackBuild b/network/haproxy/haproxy.SlackBuild
index 501e10430e..2513ce6fcc 100644
--- a/network/haproxy/haproxy.SlackBuild
+++ b/network/haproxy/haproxy.SlackBuild
@@ -29,10 +29,19 @@
PRGNAM=haproxy
VERSION=1.3.15.7
-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
@@ -59,6 +68,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e