From 4f41ec01d4cf8583d0ba5961563df6aa6b805466 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:14:17 -0400 Subject: network/tor: Misc automated cleanups. Signed-off-by: David Somero --- network/tor/tor.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild index 385f15603f041..26189716edc49 100755 --- a/network/tor/tor.SlackBuild +++ b/network/tor/tor.SlackBuild @@ -24,7 +24,6 @@ PRGNAM=tor VERSION=0.2.1.25 -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -34,6 +33,16 @@ TOR_UID=${TOR_UID:-220} TOR_GROUP=${TOR_GROUP:-tor} TOR_GID=${TOR_GID:-220} +# 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 @@ -48,6 +57,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi bailout() { -- cgit v1.2.3