From c9e07058216b93b2a81b0514ed5e3e8329610f65 Mon Sep 17 00:00:00 2001 From: David Somero Date: Fri, 4 Jun 2010 01:03:34 -0400 Subject: development/qdoc3: Misc automated cleanups. Signed-off-by: David Somero --- development/qdoc3/qdoc3.SlackBuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/development/qdoc3/qdoc3.SlackBuild b/development/qdoc3/qdoc3.SlackBuild index 236cd49dca..d69283ab5a 100644 --- a/development/qdoc3/qdoc3.SlackBuild +++ b/development/qdoc3/qdoc3.SlackBuild @@ -29,12 +29,21 @@ PRGNAM=qdoc3 VERSION=${VERSION:-4.5.1} -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} SRC_NAME=qt-x11-opensource-src-$VERSION +# 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 @@ -49,6 +58,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