diff mbox series

[meta-oe] iperf2: Fix compilation with --disable-ipv6

Message ID 20260723101020.145255-1-alexander.stein@ew.tq-group.com
State New
Headers show
Series [meta-oe] iperf2: Fix compilation with --disable-ipv6 | expand

Commit Message

Alexander Stein July 23, 2026, 10:10 a.m. UTC 
Cherry-pick upstream commit.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 ...89-Compilation-fails-with-disable-ip.patch | 25 +++++++++++++++++++
 .../recipes-benchmark/iperf2/iperf2_2.2.1.bb  |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 meta-oe/recipes-benchmark/iperf2/iperf2/0001-fix-for-ticket-389-Compilation-fails-with-disable-ip.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-fix-for-ticket-389-Compilation-fails-with-disable-ip.patch b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-fix-for-ticket-389-Compilation-fails-with-disable-ip.patch
new file mode 100644
index 0000000000..f1590dab1a
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-fix-for-ticket-389-Compilation-fails-with-disable-ip.patch
@@ -0,0 +1,25 @@ 
+From ffc2004daf5e8335b7a87664426728f53fc7a5d0 Mon Sep 17 00:00:00 2001
+From: Robert McMahon <rjmcmahon@rjmcmahon.com>
+Date: Mon, 12 Jan 2026 10:14:08 -0800
+Subject: [PATCH] fix for ticket 389: Compilation fails with --disable-ipv6
+
+Upstream-Status: Backport [https://sourceforge.net/p/iperf2/code/ci/0fe3730e2c1d045077ac2cf76a796e95f3455952/]
+
+Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
+---
+ src/iperf_multicast_api.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/iperf_multicast_api.c b/src/iperf_multicast_api.c
+index 48c0184d..06f3399d 100644
+--- a/src/iperf_multicast_api.c
++++ b/src/iperf_multicast_api.c
+@@ -176,7 +176,7 @@ static int iperf_multicast_join_v4_pi (struct thread_Settings *inSettings) {
+ 
+ static int iperf_multicast_join_v6 (struct thread_Settings *inSettings) {
+ #if (HAVE_DECL_IPV6_JOIN_GROUP || HAVE_DECL_IPV6_ADD_MEMBERSHIP)
+-#if HAVE_STRUCT_IPV6_MREQ
++#if (HAVE_IPV6 && HAVE_STRUCT_IPV6_MREQ)
+     struct ipv6_mreq mreq;
+     memcpy(&mreq.ipv6mr_multiaddr, SockAddr_get_in6_addr(&inSettings->multicast_group), sizeof(mreq.ipv6mr_multiaddr));
+     mreq.ipv6mr_interface = mcast_iface(inSettings);
diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb
index cc7a1561df..840e79bd35 100644
--- a/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb
+++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb
@@ -6,6 +6,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=e136a7b2560d80bcbf0d9b3e1356ecff"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/iperf-${PV}.tar.gz \
            file://0001-fix-for-buildroot-linux-breakage-ticket-342.patch \
+           file://0001-fix-for-ticket-389-Compilation-fails-with-disable-ip.patch \
 "
 
 SRC_URI[sha256sum] = "754ab0a7e28033dbea81308ef424bc7df4d6e2fe31b60cc536b61b51fefbd8fb"