summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuís Henrique <lmello.009@gmail.com>2010-05-13 00:24:25 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-13 00:24:25 +0200
commit25ac4feab6e81b4b406f6128a2d8903c771b80dd (patch)
tree0a7d75f20d09b1e43d723b6fa703d07c5d9b9ef3
parentfcfcfd4fdbc58f3a4314f6fa7d84463daedd612f (diff)
downloadslackbuilds-25ac4feab6e81b4b406f6128a2d8903c771b80dd.tar.gz
development/cppunit: Updated for version 1.12.1
-rw-r--r--development/cppunit/cppunit.SlackBuild6
-rw-r--r--development/cppunit/cppunit.info2
2 files changed, 7 insertions, 1 deletions
diff --git a/development/cppunit/cppunit.SlackBuild b/development/cppunit/cppunit.SlackBuild
index 092fb4e40d..19fe40fbaa 100644
--- a/development/cppunit/cppunit.SlackBuild
+++ b/development/cppunit/cppunit.SlackBuild
@@ -17,10 +17,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 # Exit on most errors
@@ -42,6 +45,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
@@ -78,4 +82,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/development/cppunit/cppunit.info b/development/cppunit/cppunit.info
index 26de7713ae..4c7b7fb381 100644
--- a/development/cppunit/cppunit.info
+++ b/development/cppunit/cppunit.info
@@ -3,6 +3,8 @@ VERSION="1.12.1"
HOMEPAGE="http://cppunit.sourceforge.net/"
DOWNLOAD="http://downloads.sourceforge.net/cppunit/cppunit-1.12.1.tar.gz"
MD5SUM="bd30e9cf5523cdfc019b94f5e1d7fd19"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Luís Henrique"
EMAIL="lmello.009@gmail.com"
APPROVED="rworkman"