From e69f54abca59ee02156b4bd163de60e20d86e310 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:07:50 -0400 Subject: [PATCH] libraries/libg15: Misc automated cleanups. Signed-off-by: David Somero --- libraries/libg15/libg15.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libraries/libg15/libg15.SlackBuild b/libraries/libg15/libg15.SlackBuild index 8475b1f6ea..c6813d9db5 100644 --- a/libraries/libg15/libg15.SlackBuild +++ b/libraries/libg15/libg15.SlackBuild @@ -26,12 +26,21 @@ PRGNAM=libg15 VERSION=${VERSION:-1.2.7} -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} DOCS="README AUTHORS ChangeLog NEWS COPYING" +# 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 @@ -46,6 +55,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e