From cbf7c09d1b3e333f95bb8a75f8874f8abd0b1a64 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Wed, 19 May 2010 22:03:15 -0500
Subject: libraries/libmusicbrainz: Miscellaneous cleanups.

---
 libraries/libmusicbrainz/README                    |  2 --
 libraries/libmusicbrainz/libmusicbrainz.SlackBuild | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'libraries/libmusicbrainz')

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
-- 
cgit v1.2.3