diff options
| author |   David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:03:48 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:03:48 -0400 |
| commit | 32e4d4e0e0454f17fa67b7812fdecbed95b9a72e (patch) | |
| tree | 07113135270f758efee8206ad077af7e15ed1fa9 /development/valkyrie | |
| parent | ac0a38410afc0198df0a97740b5dd454d69635e5 (diff) | |
| download | slackbuilds-32e4d4e0e0454f17fa67b7812fdecbed95b9a72e.tar.gz slackbuilds-32e4d4e0e0454f17fa67b7812fdecbed95b9a72e.tar.xz | |
development/valkyrie: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'development/valkyrie')
| -rw-r--r-- | development/valkyrie/valkyrie.SlackBuild | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/development/valkyrie/valkyrie.SlackBuild b/development/valkyrie/valkyrie.SlackBuild index dfbdd831a8..73f843a811 100644 --- a/development/valkyrie/valkyrie.SlackBuild +++ b/development/valkyrie/valkyrie.SlackBuild @@ -23,10 +23,19 @@ PRGNAM=valkyrie VERSION=1.3.0 -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 @@ -41,9 +50,6 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e |