From 73de4d4d660aa94b45df2299e4ed07db031f679e Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 00:59:16 -0400 Subject: academic/octave: Misc automated cleanups. Signed-off-by: David Somero --- academic/octave/octave.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'academic') diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index 107a2a4b65..32e2bfd11a 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -6,10 +6,19 @@ PRGNAM="octave" VERSION=${VERSION:-3.2.4} -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-$VERSION @@ -26,6 +35,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e -- cgit v1.2.3