summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch')
-rw-r--r--meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch60
1 files changed, 0 insertions, 60 deletions
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 @@
1From 6df092a4153c6c37cfaddcabf2cd25a910a7f6e1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Sep 2019 15:40:52 -0700
4Subject: [PATCH] Detect bool definition considering stdbool.h being present
5
6This helps in defining the value correctly on different platforms e.g.
7clang/libc++ depends on the definition coming from stdbool.h
8current builds fail to compile therefore
9
10TMPDIR/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<int>'
11template <> struct __libcpp_is_integral<int> : public true_type {};
12 ^~~~~~~~~~~~~~~~~~~~~~~~~
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16Upstream-Status: Pending
17
18 m4/dast.m4 | 7 ++++++-
19 1 file changed, 6 insertions(+), 1 deletion(-)
20
21--- a/m4/dast.m4
22+++ b/m4/dast.m4
23@@ -11,7 +11,12 @@ AH_TEMPLATE([false])
24
25 AC_DEFUN(DAST_CHECK_BOOL, [
26
27-AC_CHECK_SIZEOF(bool)
28+if test "$ac_cv_header_stdbool_h" = yes; then
29+ AC_CHECK_SIZEOF(bool,,[#include <stdbool.h>])
30+else
31+ AC_CHECK_SIZEOF(bool)
32+fi
33+
34 if test "$ac_cv_sizeof_bool" = 0 ; then
35 AC_DEFINE(bool, int)
36 fi
37--- a/configure.ac
38+++ b/configure.ac
39@@ -113,7 +113,7 @@ AC_SEARCH_LIBS([socket], [socket], [],
40
41 dnl Checks for header files.
42 AC_HEADER_STDC
43-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])
44+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])
45
46 dnl ===================================================================
47 dnl Checks for typedefs, structures
48--- a/include/util.h
49+++ b/include/util.h
50@@ -56,7 +56,9 @@
51 #ifdef HAVE_CONFIG_H
52 #include "config.h"
53 #endif
54-
55+#ifdef HAVE_STDBOOL_H
56+# include <stdbool.h>
57+#endif
58 #ifdef __cplusplus
59 extern "C" {
60 #endif