From e45bd4ceb58f4638950f13e26dbb0d673d2e6636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Tue, 2 Jul 2024 20:09:01 +0200 Subject: groups.d/241.native_packages_inet.d/iperf.package: adds v3.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups.d/241.native_packages_inet.d/iperf.package | 8 ++++++ patches/iperf-3.17.1.local.patch | 32 +++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 groups.d/241.native_packages_inet.d/iperf.package create mode 100644 patches/iperf-3.17.1.local.patch diff --git a/groups.d/241.native_packages_inet.d/iperf.package b/groups.d/241.native_packages_inet.d/iperf.package new file mode 100644 index 00000000..3d57230d --- /dev/null +++ b/groups.d/241.native_packages_inet.d/iperf.package @@ -0,0 +1,8 @@ +: ${PKG_IPERF_DEPENDS:="libressl"}; +: ${PKG_IPERF_SHA256SUM:=84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa}; +: ${PKG_IPERF_VERSION:=3.17.1}; +: ${PKG_IPERF_URL:=https://github.com/esnet/iperf/releases/download/${PKG_IPERF_VERSION}/iperf-${PKG_IPERF_VERSION}.tar.gz}; + +ex_pkg_register "iperf" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; + +# vim:filetype=sh textwidth=0 diff --git a/patches/iperf-3.17.1.local.patch b/patches/iperf-3.17.1.local.patch new file mode 100644 index 00000000..35e28260 --- /dev/null +++ b/patches/iperf-3.17.1.local.patch @@ -0,0 +1,32 @@ +diff -ru iperf-3.17.1.orig/src/iperf_api.h iperf-3.17.1/src/iperf_api.h +--- iperf-3.17.1.orig/src/iperf_api.h 2024-05-13 20:40:55.000000000 +0200 ++++ iperf-3.17.1/src/iperf_api.h 2024-07-02 20:05:03.818580250 +0200 +@@ -44,7 +44,7 @@ + #include + #else + #warning "No available" +-typedef u_int64_t atomic_uint_fast64_t; ++typedef uint64_t atomic_uint_fast64_t; + #endif // HAVE_STDATOMIC_H + + struct iperf_test; +diff -ru iperf-3.17.1.orig/src/main.c iperf-3.17.1/src/main.c +--- iperf-3.17.1.orig/src/main.c 2024-05-13 20:40:55.000000000 +0200 ++++ iperf-3.17.1/src/main.c 2024-07-02 20:04:06.908582670 +0200 +@@ -65,15 +65,6 @@ + * know how to check this on GCC. GCC on CentOS 7 / RHEL 7 is the + * targeted use case for these check. + */ +-#ifndef HAVE_STDATOMIC_H +-#ifdef __GNUC__ +- if (! __atomic_always_lock_free (sizeof (u_int64_t), 0)) { +-#endif // __GNUC__ +- fprintf(stderr, "Warning: Cannot guarantee lock-free operation with 64-bit data types\n"); +-#ifdef __GNUC__ +- } +-#endif // __GNUC__ +-#endif // HAVE_STDATOMIC_H + + // XXX: Setting the process affinity requires root on most systems. + // Is this a feature we really need? +Only in iperf-3.17.1/src: main.c.orig -- cgit v1.2.3