From e977c3acfa70ada306988efbbd9d30cbfc49fe26 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:10:39 -0400 Subject: libraries/xapian-core: Misc automated cleanups. Signed-off-by: David Somero --- libraries/xapian-core/xapian-core.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'libraries/xapian-core') diff --git a/libraries/xapian-core/xapian-core.SlackBuild b/libraries/xapian-core/xapian-core.SlackBuild index 5a4e46e532..724baa51e2 100644 --- a/libraries/xapian-core/xapian-core.SlackBuild +++ b/libraries/xapian-core/xapian-core.SlackBuild @@ -25,10 +25,19 @@ PRGNAM=xapian-core VERSION=1.0.13 -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 @@ -43,6 +52,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