aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-19 22:04:17 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-21 01:37:18 -0500
commit2de1d14281cec78203281ad4f0c00082d91175a4 (patch)
tree4bb713bc59a5fc7edbcd194f6ee540eadaa4a15a
parentcbf7c09d1b3e333f95bb8a75f8874f8abd0b1a64 (diff)
libraries/libmusicbrainz3: Miscellaneous cleanups.
-rw-r--r--libraries/libmusicbrainz3/README2
-rw-r--r--libraries/libmusicbrainz3/libmusicbrainz3.SlackBuild14
2 files changed, 14 insertions, 2 deletions
diff --git a/libraries/libmusicbrainz3/README b/libraries/libmusicbrainz3/README
index 799867485d639..5ad6850c1336e 100644
--- a/libraries/libmusicbrainz3/README
+++ b/libraries/libmusicbrainz3/README
@@ -2,7 +2,7 @@ The libmusicbrainz (also known as mb_client or MusicBrainz Client Library)
is a development library geared towards developers who wish to add
MusicBrainz lookup capabilities to their applications.
-This requires libdiscid, and cppunit is an optional build-time dep.
+cppunit is an optional build-time dependency.
Note: This is a new library for libmusicbrainz, which is not backwards
compatible with previous versions. It is safe to have version 2.X and
diff --git a/libraries/libmusicbrainz3/libmusicbrainz3.SlackBuild b/libraries/libmusicbrainz3/libmusicbrainz3.SlackBuild
index 05532cf50f3da..84836a053d22d 100644
--- a/libraries/libmusicbrainz3/libmusicbrainz3.SlackBuild
+++ b/libraries/libmusicbrainz3/libmusicbrainz3.SlackBuild
@@ -6,12 +6,21 @@
PRGNAM=libmusicbrainz3
VERSION=${VERSION:-3.0.2}
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
SRCNAM=libmusicbrainz
+# 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
@@ -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