summaryrefslogtreecommitdiffstats
path: root/source/ap/cdrdao/cdrdao.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/cdrdao/cdrdao.SlackBuild')
-rwxr-xr-xsource/ap/cdrdao/cdrdao.SlackBuild27
1 files changed, 20 insertions, 7 deletions
diff --git a/source/ap/cdrdao/cdrdao.SlackBuild b/source/ap/cdrdao/cdrdao.SlackBuild
index fccf3ab83..95216d513 100755
--- a/source/ap/cdrdao/cdrdao.SlackBuild
+++ b/source/ap/cdrdao/cdrdao.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,21 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=1.2.1
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=1.2.3
BUILD=${BUILD:-1}
+# 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
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -35,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
CWD=$(pwd)
@@ -46,7 +59,7 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf cdrdao-$VERSION
-tar xvf $CWD/cdrdao-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/cdrdao-$VERSION.tar.?z* || exit 1
cd cdrdao-$VERSION
chown -R root:root .
find . \
@@ -60,7 +73,7 @@ CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
- $ARCH-slackware-linux
+ --build=$ARCH-slackware-linux
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
@@ -69,7 +82,7 @@ gzip -9 $PKG/usr/man/man1/*.?
mkdir -p $PKG/usr/doc/cdrdao-$VERSION
cp -a \
- AUTHORS COPYING CREDITS INSTALL NEWS README* \
+ AUTHORS COPYING* CREDITS INSTALL NEWS README* \
cdrdao.lsm \
contrib \
$PKG/usr/doc/cdrdao-$VERSION