From 4b3f8c09b33e06770bc485d221eedfe6b8f99d0c Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:05:15 -0400 Subject: graphics/fontmatrix: Misc automated cleanups. Signed-off-by: David Somero --- graphics/fontmatrix/fontmatrix.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/graphics/fontmatrix/fontmatrix.SlackBuild b/graphics/fontmatrix/fontmatrix.SlackBuild index 22074944ecea2..c14a4b7665a23 100644 --- a/graphics/fontmatrix/fontmatrix.SlackBuild +++ b/graphics/fontmatrix/fontmatrix.SlackBuild @@ -6,10 +6,19 @@ PRGNAM=fontmatrix VERSION=${VERSION:-0.6.0} -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 # Decide if we compile fontmatrix with icu4c and/or podofo support. Default is no. -- cgit v1.2.3