libraries/libmusicbrainz3: Miscellaneous cleanups.

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 

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