diff options
| author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:14:17 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:14:17 -0400 |
| commit | 4f41ec01d4cf8583d0ba5961563df6aa6b805466 (patch) | |
| tree | 9a40c077bfb09ae0d1cddcb03178786f0a7be38f | |
| parent | e9d3f1d5c0000ff9b283cd0489346656182ef743 (diff) | |
| download | slackbuilds-4f41ec01d4cf8583d0ba5961563df6aa6b805466.tar.gz | |
network/tor: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
| -rwxr-xr-x | network/tor/tor.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild index 385f15603f..26189716ed 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() { |