From 7f8c99bacf3a39a4dd1dbbc5d0780741f478e0b8 Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Fri, 28 Mar 2025 13:04:08 -0400 Subject: [PATCH] iperf2: upgrade 2.0.13 -> 2.2.1 Release notes: https://sourceforge.net/p/iperf2/code/ci/2-2-1/tree/NEWS.md Drop the stdbool patch. It seems to have been fixed upstream by: ae0284e4 2020-10-22 Replace DAST_CHECK_BOOL with AC_HEADER_STDBOOL Signed-off-by: Randy MacLeod Signed-off-by: Khem Raj --- ...nition-considering-stdbool.h-being-p.patch | 60 ------------------- .../{iperf2_2.0.13.bb => iperf2_2.2.1.bb} | 3 +- 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch rename meta-oe/recipes-benchmark/iperf2/{iperf2_2.0.13.bb => iperf2_2.2.1.bb} (79%) diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch deleted file mode 100644 index dc3b85f8ef..0000000000 --- a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 6df092a4153c6c37cfaddcabf2cd25a910a7f6e1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 2 Sep 2019 15:40:52 -0700 -Subject: [PATCH] Detect bool definition considering stdbool.h being present - -This helps in defining the value correctly on different platforms e.g. -clang/libc++ depends on the definition coming from stdbool.h -current builds fail to compile therefore - -TMPDIR/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/iperf2/2.0.13-r0/recipe-sysroot/usr/include/c++/v1/type_traits:742:29: error: redefinition of '__libcpp_is_integral' -template <> struct __libcpp_is_integral : public true_type {}; - ^~~~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - m4/dast.m4 | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/m4/dast.m4 -+++ b/m4/dast.m4 -@@ -11,7 +11,12 @@ AH_TEMPLATE([false]) - - AC_DEFUN(DAST_CHECK_BOOL, [ - --AC_CHECK_SIZEOF(bool) -+if test "$ac_cv_header_stdbool_h" = yes; then -+ AC_CHECK_SIZEOF(bool,,[#include ]) -+else -+ AC_CHECK_SIZEOF(bool) -+fi -+ - if test "$ac_cv_sizeof_bool" = 0 ; then - AC_DEFINE(bool, int) - fi ---- a/configure.ac -+++ b/configure.ac -@@ -113,7 +113,7 @@ AC_SEARCH_LIBS([socket], [socket], [], - - dnl Checks for header files. - AC_HEADER_STDC --AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h]) -+AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdbool.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h]) - - dnl =================================================================== - dnl Checks for typedefs, structures ---- a/include/util.h -+++ b/include/util.h -@@ -56,7 +56,9 @@ - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -- -+#ifdef HAVE_STDBOOL_H -+# include -+#endif - #ifdef __cplusplus - extern "C" { - #endif diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb similarity index 79% rename from meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb rename to meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb index 7b3d23a53f..a439616ba4 100644 --- a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb +++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb @@ -5,10 +5,9 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e136a7b2560d80bcbf0d9b3e1356ecff" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/iperf-${PV}.tar.gz \ - file://0001-Detect-bool-definition-considering-stdbool.h-being-p.patch \ " -SRC_URI[sha256sum] = "c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad" +SRC_URI[sha256sum] = "754ab0a7e28033dbea81308ef424bc7df4d6e2fe31b60cc536b61b51fefbd8fb" S = "${WORKDIR}/iperf-${PV}"