summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:02 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:14:02 -0400
commitb657f3e91d4382a05ebd6b6c6da41cbb8bff0fac (patch)
tree18d38b6697dafd2f4ac5f298e137dc4234a2be04
parentd011b2dcdfd963bb2b47beebd9c30fb48a47c240 (diff)
downloadslackbuilds-b657f3e91d4382a05ebd6b6c6da41cbb8bff0fac.tar.gz
network/proxytunnel: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--network/proxytunnel/proxytunnel.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/network/proxytunnel/proxytunnel.SlackBuild b/network/proxytunnel/proxytunnel.SlackBuild
index 10ae26e3fb..d796ae32c1 100644
--- a/network/proxytunnel/proxytunnel.SlackBuild
+++ b/network/proxytunnel/proxytunnel.SlackBuild
@@ -6,10 +6,19 @@
PRGNAM=proxytunnel
VERSION=${VERSION:-1.9.0}
-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 # Exit on most errors