[arch-commits] Commit in netperf/repos/community-x86_64 (7 files)
Sébastien Luttringer
seblu at archlinux.org
Fri Oct 18 14:09:06 UTC 2019
Date: Friday, October 18, 2019 @ 14:09:05
Author: seblu
Revision: 516869
archrelease: copy trunk to community-x86_64
Added:
netperf/repos/community-x86_64/001-fix-inlining.patch
(from rev 516867, netperf/trunk/001-fix-inlining.patch)
netperf/repos/community-x86_64/PKGBUILD
(from rev 516867, netperf/trunk/PKGBUILD)
netperf/repos/community-x86_64/netperf.install
(from rev 516867, netperf/trunk/netperf.install)
netperf/repos/community-x86_64/netserver.service
(from rev 516868, netperf/trunk/netserver.service)
Deleted:
netperf/repos/community-x86_64/001-fix-inlining.patch
netperf/repos/community-x86_64/PKGBUILD
netperf/repos/community-x86_64/netperf.service
------------------------+
001-fix-inlining.patch | 64 +++++++++++++--------------
PKGBUILD | 109 +++++++++++++++++++++++------------------------
netperf.install | 14 ++++++
netperf.service | 9 ---
netserver.service | 9 +++
5 files changed, 110 insertions(+), 95 deletions(-)
Deleted: 001-fix-inlining.patch
===================================================================
--- 001-fix-inlining.patch 2019-10-18 14:09:03 UTC (rev 516868)
+++ 001-fix-inlining.patch 2019-10-18 14:09:05 UTC (rev 516869)
@@ -1,32 +0,0 @@
-# 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;
-
Copied: netperf/repos/community-x86_64/001-fix-inlining.patch (from rev 516867, netperf/trunk/001-fix-inlining.patch)
===================================================================
--- 001-fix-inlining.patch (rev 0)
+++ 001-fix-inlining.patch 2019-10-18 14:09:05 UTC (rev 516869)
@@ -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;
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-18 14:09:03 UTC (rev 516868)
+++ PKGBUILD 2019-10-18 14:09:05 UTC (rev 516869)
@@ -1,54 +0,0 @@
-# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy at gmail.com>
-# Contributor: Tilman Blumenbach <tilman (at) ax86 (dot) net>
-
-pkgname=netperf
-pkgver=2.7.0
-pkgrel=4
-pkgdesc='Benchmarking tool for many different types of networking'
-url='https://github.com/HewlettPackard/netperf/'
-license=('custom')
-arch=('x86_64')
-depends=('glibc' 'libsmbios' 'lksctp-tools')
-source=("https://github.com/HewlettPackard/netperf/archive/$pkgname-$pkgver.tar.gz"
- "$pkgname.service"
- '001-fix-inlining.patch')
-md5sums=('e0d45b5bca1eee2aef0155de82366202'
- '7bce5056b2a24d76fcc0c20e4b527416'
- '0160c47c86ff1fca8df64cfb4cd4d9f2')
-
-prepare() {
- cd netperf-netperf-$pkgver
- # apply patch from the source array (should be a pacman feature)
- local filename
- for filename in "${source[@]}"; do
- if [[ "$filename" =~ \.patch$ ]]; then
- msg2 "Applying patch ${filename##*/}"
- patch -p1 -N -i "$srcdir/${filename##*/}"
- fi
- done
- :
-}
-
-build() {
- cd netperf-netperf-$pkgver
- ./configure \
- --prefix=/usr \
- --enable-demo \
- --enable-unixdomain \
- --enable-dccp \
- --enable-sctp
- make
-}
-
-package() {
- cd netperf-netperf-$pkgver
- make DESTDIR="$pkgdir" install
- # license
- install -D -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
- # systemd
- install -D -m 644 ../$pkgname.service \
- "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: netperf/repos/community-x86_64/PKGBUILD (from rev 516867, netperf/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-18 14:09:05 UTC (rev 516869)
@@ -0,0 +1,55 @@
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Tilman Blumenbach <tilman (at) ax86 (dot) net>
+
+pkgname=netperf
+pkgver=2.7.0
+pkgrel=5
+pkgdesc='Benchmarking tool for many different types of networking'
+url='https://github.com/HewlettPackard/netperf/'
+license=('custom')
+arch=('x86_64')
+depends=('glibc' 'libsmbios' 'lksctp-tools')
+install=netperf.install
+source=("https://github.com/HewlettPackard/netperf/archive/$pkgname-$pkgver.tar.gz"
+ 'netserver.service'
+ '001-fix-inlining.patch')
+sha224sums=('6ab49c94d6231d4848bc43c8d56ad4a2611862f800a61009f3b2f2fe'
+ 'c5c48a480d62e82d1e65cc3ef8472864bf12d2cc527d6a9c12dca613'
+ '7a30925a46ab5e40ccc2b966a5d7e57a15967b9116c8773cd75030f5')
+
+prepare() {
+ cd netperf-netperf-$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ msg2 "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
+ :
+}
+
+build() {
+ cd netperf-netperf-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --enable-demo \
+ --enable-unixdomain \
+ --enable-dccp \
+ --enable-sctp
+ make
+}
+
+package() {
+ cd netperf-netperf-$pkgver
+ make DESTDIR="$pkgdir" install
+ # license
+ install -D -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ # systemd
+ install -D -m 644 {..,"$pkgdir"/usr/lib/systemd/system}/netserver.service
+}
+
+# vim:set ts=2 sw=2 et:
Copied: netperf/repos/community-x86_64/netperf.install (from rev 516867, netperf/trunk/netperf.install)
===================================================================
--- netperf.install (rev 0)
+++ netperf.install 2019-10-18 14:09:05 UTC (rev 516869)
@@ -0,0 +1,14 @@
+#/bin/bash
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ # change
+ if (( $(vercmp $2 2.7.0-5) < 0 )); then
+ echo '==> netperf.service renamed to netserver.service'
+ echo '==> You have to enable the new unit manually'
+ fi
+ :
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: netperf.service
===================================================================
--- netperf.service 2019-10-18 14:09:03 UTC (rev 516868)
+++ netperf.service 2019-10-18 14:09:05 UTC (rev 516869)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Netperf Benchmark Server
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/netserver -D
-
-[Install]
-WantedBy=multi-user.target
Copied: netperf/repos/community-x86_64/netserver.service (from rev 516868, netperf/trunk/netserver.service)
===================================================================
--- netserver.service (rev 0)
+++ netserver.service 2019-10-18 14:09:05 UTC (rev 516869)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Netperf Benchmark Server
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/netserver -D
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list