From 0bf465217e3481554e75523cdb697cd64895d175 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:08:38 -0400 Subject: libraries/libpaper: Misc automated cleanups. Signed-off-by: David Somero --- libraries/libpaper/libpaper.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'libraries/libpaper') diff --git a/libraries/libpaper/libpaper.SlackBuild b/libraries/libpaper/libpaper.SlackBuild index 0d2bf165cb..2531f567d7 100644 --- a/libraries/libpaper/libpaper.SlackBuild +++ b/libraries/libpaper/libpaper.SlackBuild @@ -6,10 +6,19 @@ PRGNAM=libpaper VERSION=${VERSION:-1.1.23+nmu1} -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 @@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi # Set default papersize: a3, a4, a5, b5, letter, legal, executive, note, 11x17 -- cgit v1.2.3