summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-19 22:03:15 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-21 01:37:13 -0500
commitcbf7c09d1b3e333f95bb8a75f8874f8abd0b1a64 (patch)
tree726cbb7211a52250cbda89ad564a6e5ae0f9e8b3
parent2efd42afd82a48d8b7ff0a10cf205c236e862040 (diff)
downloadslackbuilds-cbf7c09d1b3e333f95bb8a75f8874f8abd0b1a64.tar.gz
libraries/libmusicbrainz: Miscellaneous cleanups.
-rw-r--r--libraries/libmusicbrainz/README2
-rw-r--r--libraries/libmusicbrainz/libmusicbrainz.SlackBuild14
2 files changed, 13 insertions, 3 deletions
diff --git a/libraries/libmusicbrainz/README b/libraries/libmusicbrainz/README
index fdd8829e6c..fb2e658c0d 100644
--- a/libraries/libmusicbrainz/README
+++ b/libraries/libmusicbrainz/README
@@ -3,5 +3,3 @@ MusicBrainz is a user-maintained community music metadatabase.
The MusicBrainz client library allows applications to make metadata
lookups to a MusicBrainz server, generate signatures from WAV files
and create CD Index Disk IDs from audio CD-ROMs.
-
-This requires libdiscid.
diff --git a/libraries/libmusicbrainz/libmusicbrainz.SlackBuild b/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
index 3dc4fa61e1..cf30a9df6d 100644
--- a/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
+++ b/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
@@ -4,10 +4,19 @@
PRGNAM=libmusicbrainz
VERSION=${VERSION:-2.1.5}
-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
@@ -22,6 +31,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e