From 1ec57e9095c54d0c7625adc213d67795a2599539 Mon Sep 17 00:00:00 2001 From: Damien Goutte-Gattat Date: Thu, 10 Sep 2009 09:41:26 +0200 Subject: [PATCH] l/libavc1394: Updated for Slackware-13.0. --- l/libavc1394/libavc1394.SlackBuild | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/l/libavc1394/libavc1394.SlackBuild b/l/libavc1394/libavc1394.SlackBuild index 31b965fa..ef336e9f 100755 --- a/l/libavc1394/libavc1394.SlackBuild +++ b/l/libavc1394/libavc1394.SlackBuild @@ -32,15 +32,16 @@ ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz} WGET=${WGET:-http://kent.dl.sourceforge.net/sourceforge/libavc1394/$ARCHIVE} # Build infos -NAMETGZ=${NAMETGZ:-libavc1394} -BUILD=${BUILD:-2GGD} +NAMEPKG=${NAMEPKG:-libavc1394} +BUILD=${BUILD:-3GGD} ARCH=${ARCH:-i486} JOBS=${JOBS:-1} +EXT=${EXT:-txz} # Directories TMP=${TMP:-/tmp} OUT=${OUT:-$TMP/build} -PKG=${PKG:-$OUT/$NAMETGZ} +PKG=${PKG:-$OUT/$NAMEPKG} CWD=$(pwd) set -e # Quit if a command returns non-zero @@ -56,12 +57,14 @@ if [ ! -d $TMP ]; then fi # Compilation flags +LIBDIRSUFFIX="" case "$ARCH" in i?86) CPUOPT="-O2 -march=$ARCH -mtune=i686" ;; x86_64) CPUOPT="-O2 -fPIC" + LIBDIRSUFFIX="64" ;; *) CPUOPT="-O2" @@ -85,14 +88,11 @@ CFLAGS=$CPUOPT \ CXXFLAGS=$CPUOPT \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib$LIBDIRSUFFIX \ --disable-dependency-tracking \ --disable-static make -j $JOBS -make install DESTDIR=$PKG - -# Strip binaries -find $PKG | xargs file | grep "ELF 32-bit LSB" | cut -d : -f 1 | \ - xargs strip --strip-unneeded 2> /dev/null +make install-strip DESTDIR=$PKG # Compress man and info pages find $PKG/usr/man -type f -exec gzip -9 '{}' \; @@ -111,7 +111,7 @@ cd $PKG mkdir -p $OUT PACKAGING=" chown root:root . -R -/sbin/makepkg -l y -c n $OUT/$NAMETGZ-$VERSION-$ARCH-$BUILD.tgz +/sbin/makepkg -l y -c n $OUT/$NAMEPKG-$VERSION-$ARCH-$BUILD.$EXT rm -rf $PKG rm -rf $TMP/$NAME "