[arch-commits] Commit in netperf/trunk (3 files)

[Sébastien Luttringer]

    Date: Tuesday, August 4, 2015 @ 20:38:57
  Author: seblu
Revision: 137948

upgpkg: netperf 2.7.0-1

Added:
  netperf/trunk/001-fix-inlining.patch
Modified:
  netperf/trunk/PKGBUILD
  netperf/trunk/netperf.install

------------------------+
 001-fix-inlining.patch |   32 ++++++++++++++++++++++++++++++++
 PKGBUILD               |   19 ++++++++++++-------
 netperf.install        |    6 +++---
 3 files changed, 47 insertions(+), 10 deletions(-)

Added: 001-fix-inlining.patch
===================================================================
--- 001-fix-inlining.patch	                        (rev 0)
+++ 001-fix-inlining.patch	2015-08-04 18:38:57 UTC (rev 137948)
@@ -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;
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-04 18:08:20 UTC (rev 137947)
+++ PKGBUILD	2015-08-04 18:38:57 UTC (rev 137948)
@@ -4,8 +4,8 @@
 # Contributor: Tilman Blumenbach <tilman (at) ax86 (dot) net>
 
 pkgname=netperf
-pkgver=2.6.0
-pkgrel=3
+pkgver=2.7.0
+pkgrel=1
 pkgdesc='Benchmarking tool for many different types of networking'
 url='http://www.netperf.org/'
 license=('custom')
@@ -12,12 +12,17 @@
 arch=('i686' 'x86_64')
 depends=('glibc' 'libsmbios' 'lksctp-tools')
 install=$pkgname.install
-source=(
-  "ftp://ftp.netperf.org/netperf/$pkgname-$pkgver.tar.bz2"
-  "$pkgname.service")
-md5sums=('9654ffdfd4c4f2c93ce3733cd9ed9236'
-         '7bce5056b2a24d76fcc0c20e4b527416')
+source=("ftp://ftp.netperf.org/netperf/$pkgname-$pkgver.tar.bz2"
+        "$pkgname.service"
+        '001-fix-inlining.patch')
+md5sums=('ad1c5342d61f297c417a93133aeba65a'
+         '7bce5056b2a24d76fcc0c20e4b527416'
+         '0160c47c86ff1fca8df64cfb4cd4d9f2')
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < 001-fix-inlining.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure \

Modified: netperf.install
===================================================================
--- netperf.install	2015-08-04 18:08:20 UTC (rev 137947)
+++ netperf.install	2015-08-04 18:38:57 UTC (rev 137948)
@@ -2,7 +2,7 @@
 filelist=(netperf.info)
 
 post_install() {
-  [ -x usr/bin/install-info ] || return 0
+  [[ -x usr/bin/install-info ]] || return 0
   for file in "${filelist[@]}"; do
     install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
@@ -9,11 +9,11 @@
 }
 
 post_upgrade() {
-  post_install $1
+  post_install "$1"
 }
 
 pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
+  [[ -x usr/bin/install-info ]] || return 0
   for file in "${filelist[@]}"; do
     install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done