From 96fb70f11765ef32236f20ca714048be4500bbb4 Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@liwjatan.at>
Date: Thu, 13 May 2010 00:25:49 +0200
Subject: development/yasm: Updated for version 0.8.0

---
 development/yasm/yasm.SlackBuild | 14 +++++++++-----
 development/yasm/yasm.info       |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'development')

diff --git a/development/yasm/yasm.SlackBuild b/development/yasm/yasm.SlackBuild
index 8a735dbc71..2e3dd22dfd 100644
--- a/development/yasm/yasm.SlackBuild
+++ b/development/yasm/yasm.SlackBuild
@@ -35,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -58,13 +61,13 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-python \
   --enable-python-bindings \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -75,12 +78,13 @@ make install-strip DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS ChangeLog COPYING GNU_* INSTALL NEWS README *.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS ChangeLog COPYING GNU_* INSTALL NEWS README *.txt \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/yasm/yasm.info b/development/yasm/yasm.info
index 67c7b62425..ee29b1b682 100644
--- a/development/yasm/yasm.info
+++ b/development/yasm/yasm.info
@@ -3,6 +3,8 @@ VERSION="0.8.0"
 HOMEPAGE="http://www.tortall.net/projects/yasm/"
 DOWNLOAD="http://www.tortall.net/projects/yasm/releases/yasm-0.8.0.tar.gz"
 MD5SUM="84a72204c9b452a00b39b1b00495163f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="ppr:kut"
 EMAIL="pprkut@liwjatan.at"
 APPROVED="dsomero"
-- 
cgit v1.2.3