summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:12 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:12 -0400
commit07d285806df14a2e2f569b62e85bcb9db8c73e1a (patch)
treeee61d1878fc26f9d7bc6a946da776eba4a9fd193 /network
parent685bbd10f1b6239e3bdcf2ce805f951a18ebbaf1 (diff)
downloadslackbuilds-07d285806df14a2e2f569b62e85bcb9db8c73e1a.tar.gz
network/squid: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/squid/squid.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild
index 43031bfe7c..83b4597579 100644
--- a/network/squid/squid.SlackBuild
+++ b/network/squid/squid.SlackBuild
@@ -25,10 +25,19 @@
PRGNAM=squid
VERSION=3.0.STABLE24
-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
@@ -46,6 +55,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e