summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:09 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:05:09 -0400
commitf86ffad021f3ebeb4ef6cbd1f9ba8138f9c7d04b (patch)
tree48f22eaaafc3357ddb30725357ef3d4f32d2397b
parentc0d33a5a847b5e0278192fd3ecf8d5ff14975fd8 (diff)
downloadslackbuilds-f86ffad021f3ebeb4ef6cbd1f9ba8138f9c7d04b.tar.gz
graphics/dcraw: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--graphics/dcraw/dcraw.SlackBuild15
1 files changed, 14 insertions, 1 deletions
diff --git a/graphics/dcraw/dcraw.SlackBuild b/graphics/dcraw/dcraw.SlackBuild
index 21fc7b4210..4eb9689821 100644
--- a/graphics/dcraw/dcraw.SlackBuild
+++ b/graphics/dcraw/dcraw.SlackBuild
@@ -32,10 +32,20 @@
PRGNAM=dcraw
VERSION=8.99
-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
@@ -50,6 +60,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
### DCRaw build flags as suggested on the author's page.