aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornullboy <fossfun@gmail.com>2010-05-13 00:36:47 +0200
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-13 00:36:47 +0200
commit419f9cb86cc04a4c17cea3c8ecae39ed0d4cfb5c (patch)
tree767d12f8391fef8c71a15f9297dab8b7eff59026
parent8b3a307d98e94cf132d1ab4083829fdddf93cc44 (diff)
network/iperf: Updated for version 2.0.4
-rw-r--r--network/iperf/iperf.SlackBuild6
-rw-r--r--network/iperf/iperf.info2
2 files changed, 7 insertions, 1 deletions
diff --git a/network/iperf/iperf.SlackBuild b/network/iperf/iperf.SlackBuild
index 5e864f7a7c1a4..5dc64ffdbf185 100644
--- a/network/iperf/iperf.SlackBuild
+++ b/network/iperf/iperf.SlackBuild
@@ -19,10 +19,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
@@ -44,6 +47,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
@@ -73,5 +77,5 @@ 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/network/iperf/iperf.info b/network/iperf/iperf.info
index feebd87fdee18..3a20ebe8755b0 100644
--- a/network/iperf/iperf.info
+++ b/network/iperf/iperf.info
@@ -2,7 +2,9 @@ PRGNAM="iperf"
VERSION="2.0.4"
HOMEPAGE="http://sourceforge.net/projects/iperf/"
DOWNLOAD="http://downloads.sourceforge.net/iperf/iperf-2.0.4.tar.gz"
+DOWNLOAD_x86_64=""
MD5SUM="8c5bc14cc2ea55f18f22afe3c23e3dcb"
+MD5SUM_x86_64=""
MAINTAINER="nullboy"
EMAIL="fossfun@gmail.com"
APPROVED="dsomero"