summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-24 10:57:23 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-24 10:57:23 -0500
commitd9fd9d0df9e8b6571b449c00f9f2fe6191e6cb07 (patch)
treef460a4a79a2cde7a58767c61e90a2a5fee159b14
parentf3284e49455452d91790063d7248726112a99f0d (diff)
downloadslackbuilds-d9fd9d0df9e8b6571b449c00f9f2fe6191e6cb07.tar.gz
desktop/QtCurve-KDE4: Miscellaneous cleanups.
-rw-r--r--desktop/QtCurve-KDE4/QtCurve-KDE4.SlackBuild27
1 files changed, 20 insertions, 7 deletions
diff --git a/desktop/QtCurve-KDE4/QtCurve-KDE4.SlackBuild b/desktop/QtCurve-KDE4/QtCurve-KDE4.SlackBuild
index cf9c248dcb..0151abdc06 100644
--- a/desktop/QtCurve-KDE4/QtCurve-KDE4.SlackBuild
+++ b/desktop/QtCurve-KDE4/QtCurve-KDE4.SlackBuild
@@ -1,6 +1,7 @@
#!/bin/sh
# Slackware build script for: QtCurve-KDE4
+
# Copyright 2007-2009 Michiel van Wessem, Manchester, United Kingdom
# Copyright 2009 Gregory J. L. Tourte, UK (artourter@gmail.com)
# All rights reserved.
@@ -26,24 +27,36 @@
PRGNAM=QtCurve-KDE4
VERSION=${VERSION:-1.3.1}
-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) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
-SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-LIBDIRSUFFIX=""
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors