summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:22 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:16:22 -0400
commit3f6ba4cdb0628a9b614245cb5b98b476025dea54 (patch)
treeba6869aaca0351591ff933219cece5a80aedf1a4
parent21fad33106f6ec437e76088760a161dc4e74bfdc (diff)
downloadslackbuilds-3f6ba4cdb0628a9b614245cb5b98b476025dea54.tar.gz
system/p7zip: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/p7zip/p7zip.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/p7zip/p7zip.SlackBuild b/system/p7zip/p7zip.SlackBuild
index 02abd0bb18..3c49ea5df0 100644
--- a/system/p7zip/p7zip.SlackBuild
+++ b/system/p7zip/p7zip.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=p7zip
VERSION=9.04
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
# building the GUI