From 60a59631abd93c8abe1b9491013b7c74f42ca6d0 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:16:38 -0400 Subject: [PATCH] system/regionset: Misc automated cleanups. Signed-off-by: David Somero --- system/regionset/regionset.SlackBuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/system/regionset/regionset.SlackBuild b/system/regionset/regionset.SlackBuild index f459e52260..91816017e0 100755 --- a/system/regionset/regionset.SlackBuild +++ b/system/regionset/regionset.SlackBuild @@ -27,10 +27,19 @@ PRGNAM=regionset VERSION=${VERSION:-0.1} -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 @@ -45,9 +54,6 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e