From a240a3333946bbee2d8068d6dc2244b56bd75f11 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:09:00 -0400 Subject: libraries/libwhisker2: Misc automated cleanups. Signed-off-by: David Somero --- libraries/libwhisker2/libwhisker2.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'libraries/libwhisker2/libwhisker2.SlackBuild') diff --git a/libraries/libwhisker2/libwhisker2.SlackBuild b/libraries/libwhisker2/libwhisker2.SlackBuild index 1b9947d5f098..e321f7fcb1b6 100644 --- a/libraries/libwhisker2/libwhisker2.SlackBuild +++ b/libraries/libwhisker2/libwhisker2.SlackBuild @@ -24,10 +24,19 @@ PRGNAM=libwhisker2 VERSION=2.5 -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 @@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e -- cgit v1.2.3