summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 00:59:30 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-06-04 00:59:30 -0400
commit675b36c542575302575411813d6ee9da6994bd0e (patch)
tree693796fe9e590e865b294b6417dcf77de0163f7c
parenta7d24081fc66e4cd05fd9228d79a04c52273c71b (diff)
downloadslackbuilds-675b36c542575302575411813d6ee9da6994bd0e.tar.gz
academic/xcircuit: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
-rw-r--r--academic/xcircuit/xcircuit.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/academic/xcircuit/xcircuit.SlackBuild b/academic/xcircuit/xcircuit.SlackBuild
index 6aab5bca42..3aea5a9a4c 100644
--- a/academic/xcircuit/xcircuit.SlackBuild
+++ b/academic/xcircuit/xcircuit.SlackBuild
@@ -7,10 +7,19 @@
PRGNAM=xcircuit
VERSION=3.7.6
-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
@@ -25,6 +34,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e