summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:22 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 01:15:22 -0400
commit785fea08b73b70b4dbf6d8c31dae88b21046d045 (patch)
tree27b23bc0a51bb6dc86b94eaac6737cac916c1262
parent9ada6e5901c4a686fdca744677243f2680685973 (diff)
downloadslackbuilds-785fea08b73b70b4dbf6d8c31dae88b21046d045.tar.gz
system/commons-daemon: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--system/commons-daemon/commons-daemon.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/system/commons-daemon/commons-daemon.SlackBuild b/system/commons-daemon/commons-daemon.SlackBuild
index c0041bd4b6..d5bb68b2ab 100644
--- a/system/commons-daemon/commons-daemon.SlackBuild
+++ b/system/commons-daemon/commons-daemon.SlackBuild
@@ -24,10 +24,19 @@
PRGNAM=commons-daemon
VERSION=1.0.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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e