diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-fix-build-with-gcc-15.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-fix-build-with-gcc-15.patch new file mode 100644 index 0000000000..d3f3e712c9 --- /dev/null +++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-fix-build-with-gcc-15.patch @@ -0,0 +1,66 @@ +From a46630d4e373e9a3ef974c1b67767f6816c66572 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Mon, 9 Dec 2024 10:13:02 +0000 +Subject: [PATCH] fix build with gcc-15 + +Upstream-Status: Submitted [https://github.com/esnet/iperf/pull/1805] + +Signed-off-by: Martin Jansa +--- + src/iperf_api.c | 8 ++++---- + src/iperf_api.h | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/iperf_api.c b/src/iperf_api.c +index 7fb741e..4bb5b2f 100644 +--- a/src/iperf_api.c ++++ b/src/iperf_api.c +@@ -599,25 +599,25 @@ iperf_set_mapped_v4(struct iperf_test *ipt, const int val) + } + + void +-iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)()) ++iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)(struct iperf_stream *)) + { + ipt->on_new_stream = callback; + } + + void +-iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)()) ++iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *)) + { + ipt->on_test_start = callback; + } + + void +-iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)()) ++iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *)) + { + ipt->on_connect = callback; + } + + void +-iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)()) ++iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *)) + { + ipt->on_test_finish = callback; + } +diff --git a/src/iperf_api.h b/src/iperf_api.h +index 1313142..df10c38 100644 +--- a/src/iperf_api.h ++++ b/src/iperf_api.h +@@ -213,10 +213,10 @@ void iperf_set_dont_fragment( struct iperf_test* ipt, int dont_fragment ); + void iperf_set_test_congestion_control(struct iperf_test* ipt, char* cc); + void iperf_set_test_mss(struct iperf_test* ipt, int mss); + void iperf_set_mapped_v4(struct iperf_test* ipt, const int val); +-void iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)()); +-void iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)()); +-void iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)()); +-void iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)()); ++void iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)(struct iperf_stream *)); ++void iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *)); ++void iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *)); ++void iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *)); + + #if defined(HAVE_SSL) + void iperf_set_test_client_username(struct iperf_test *ipt, const char *client_username); diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.17.1.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.17.1.bb index 2a93109b9c..c84ce5e630 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.17.1.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.17.1.bb @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ file://0001-configure.ac-check-for-CPP-prog.patch \ file://do-not-listen-to-old-udp-prot-listener.patch \ + file://0001-fix-build-with-gcc-15.patch \ " SRCREV = "2acfcfe94e928e74542c9f107e02aa6dd4748a79"