From 0e21bb70624ae7ec73464f22abfdeb6a9e7ff756 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:09:31 -0400 Subject: libraries/perl-Magick: Misc automated cleanups. Signed-off-by: David Somero --- libraries/perl-Magick/perl-Magick.SlackBuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'libraries/perl-Magick') diff --git a/libraries/perl-Magick/perl-Magick.SlackBuild b/libraries/perl-Magick/perl-Magick.SlackBuild index 4ec6165377..264a1cff17 100755 --- a/libraries/perl-Magick/perl-Magick.SlackBuild +++ b/libraries/perl-Magick/perl-Magick.SlackBuild @@ -6,10 +6,19 @@ PRGNAM=perl-Magick VERSION=${VERSION:-6.53} -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,9 +33,6 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e # Exit on most errors -- cgit v1.2.3