diff options
| -rw-r--r-- | network/netperf/001-fix-inlining.patch | 32 | ||||
| -rw-r--r-- | network/netperf/netperf.SlackBuild | 15 | ||||
| -rw-r--r-- | network/netperf/netperf.info | 6 |
3 files changed, 43 insertions, 10 deletions
diff --git a/network/netperf/001-fix-inlining.patch b/network/netperf/001-fix-inlining.patch new file mode 100644 index 000000000000..eb8c09b84695 --- /dev/null +++ b/network/netperf/001-fix-inlining.patch @@ -0,0 +1,32 @@ +# Copyright Seblu 2015 +--- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200 ++++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200 +@@ -3997,11 +3997,7 @@ + } + } + +-#ifdef WIN32 +-__forceinline void demo_interval_display(double actual_interval) +-#else +- inline void demo_interval_display(double actual_interval) +-#endif ++void demo_interval_display(double actual_interval) + { + static int count = 0; + struct timeval now; +@@ -4060,15 +4056,7 @@ + important compilers have supported such a construct so it should + not be a big deal. raj 2012-01-23 */ + +-#ifdef WIN32 +-/* It would seem that the Microsoft compiler will not inline across +- source files. So there is little point in having an inline +- directive in that situation. Of course that makes me wonder if an +- inline directive has to appear in netlib.h... */ + void demo_interval_tick(uint32_t units) +-#else +- inline void demo_interval_tick(uint32_t units) +-#endif + { + double actual_interval = 0.0; + diff --git a/network/netperf/netperf.SlackBuild b/network/netperf/netperf.SlackBuild index 8c4d08dea427..a6cf15afacbb 100644 --- a/network/netperf/netperf.SlackBuild +++ b/network/netperf/netperf.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=netperf -VERSION=${VERSION:-2.6.0} +VERSION=${VERSION:-2.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -69,9 +69,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.?z* +cd $PRGNAM-$PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -79,7 +79,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +patch -p1 < $CWD/001-fix-inlining.patch + +CFLAGS="$SLKCFLAGS -fcommon" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -101,8 +103,7 @@ rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING* ChangeLog INSTALL NEWS README* doc \ +cp -a AUTHORS COPYING* ChangeLog INSTALL README* doc \ $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/install diff --git a/network/netperf/netperf.info b/network/netperf/netperf.info index d5b403eeb962..08e8298f2cd6 100644 --- a/network/netperf/netperf.info +++ b/network/netperf/netperf.info @@ -1,8 +1,8 @@ PRGNAM="netperf" -VERSION="2.6.0" +VERSION="2.7.0" HOMEPAGE="http://www.netperf.org/netperf" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/netperf-2.6.0.tar.bz2" -MD5SUM="9654ffdfd4c4f2c93ce3733cd9ed9236" +DOWNLOAD="https://github.com/HewlettPackard/netperf/archive/netperf-2.7.0/netperf-netperf-2.7.0.tar.gz" +MD5SUM="e0d45b5bca1eee2aef0155de82366202" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |