summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:07:28 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:07:28 -0400
commit406855332f08372ac97ee472a92de40c6aa25990 (patch)
tree98ec095ce33a2d378521b642d47f21b9f5cad605
parentb3353f3f04d288963fb23caa96836779d840e843 (diff)
downloadslackbuilds-406855332f08372ac97ee472a92de40c6aa25990.tar.gz
libraries/libcap-ng: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/libcap-ng/libcap-ng.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/libraries/libcap-ng/libcap-ng.SlackBuild b/libraries/libcap-ng/libcap-ng.SlackBuild
index e26dcaf517..abaf5e655b 100644
--- a/libraries/libcap-ng/libcap-ng.SlackBuild
+++ b/libraries/libcap-ng/libcap-ng.SlackBuild
@@ -9,10 +9,19 @@
PRGNAM=libcap-ng
VERSION=${VERSION:-0.6.2}
-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
@@ -27,6 +36,9 @@ 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