From a2ac23382dc4949d0776312b4d8286d90c56486f Mon Sep 17 00:00:00 2001
From: Mauro Giachero <mauro dot giachero at gmail dot com>
Date: Thu, 13 May 2010 00:29:01 +0200
Subject: libraries/commoncpp2: Updated for version 1.7.3

---
 libraries/commoncpp2/commoncpp2.SlackBuild | 8 ++++++--
 libraries/commoncpp2/commoncpp2.info       | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'libraries/commoncpp2')

diff --git a/libraries/commoncpp2/commoncpp2.SlackBuild b/libraries/commoncpp2/commoncpp2.SlackBuild
index 8f4c5f8764..93d9db0a9c 100644
--- a/libraries/commoncpp2/commoncpp2.SlackBuild
+++ b/libraries/commoncpp2/commoncpp2.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
@@ -73,6 +76,7 @@ CFLAGS="$SLKCFLAGS -I." \
 CXXFLAGS="$SLKCFLAGS -I." \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --infodir=/usr/info \
@@ -89,7 +93,7 @@ make install DESTDIR=$PKG
 mv doc/man $PKG/usr
 
 # Remove static libraries
-rm $PKG/usr/lib/*a
+rm $PKG/usr/lib${LIBDIRSUFFIX}/*a
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -121,4 +125,4 @@ 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/libraries/commoncpp2/commoncpp2.info b/libraries/commoncpp2/commoncpp2.info
index c5a347ad28..04ea830398 100644
--- a/libraries/commoncpp2/commoncpp2.info
+++ b/libraries/commoncpp2/commoncpp2.info
@@ -2,7 +2,9 @@ PRGNAM="commoncpp2"
 VERSION="1.7.3"
 HOMEPAGE="http://www.gnutelephony.org/"
 DOWNLOAD="http://www.gnutelephony.org/dist/archive/commoncpp2-1.7.3.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="ca741179a728d264eb276ae471ebaf70"
+MD5SUM_x86_64=""
 MAINTAINER="Mauro Giachero"
 EMAIL="mauro dot giachero at gmail dot com"
 APPROVED="dsomero"
-- 
cgit v1.2.3