aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2016-06-15 11:51:11 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2016-06-22 17:12:37 +0200
commit0647b7d6400b1c40fc6cb40596e56b852ceb85c5 (patch)
tree8f955255bde25ba7f9a1524fcf7dd6aa4352fd93
parente092a957b2c71abb7b770a772d26f9de8761413a (diff)
downloadmeta-openembedded-contrib-0647b7d6400b1c40fc6cb40596e56b852ceb85c5.tar.gz
meta-openembedded-contrib-0647b7d6400b1c40fc6cb40596e56b852ceb85c5.tar.bz2
meta-openembedded-contrib-0647b7d6400b1c40fc6cb40596e56b852ceb85c5.zip
iperf: resolve issues with gcc6
Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch16
-rw-r--r--meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb4
2 files changed, 17 insertions, 3 deletions
diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
new file mode 100644
index 0000000000..348e316ce4
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
@@ -0,0 +1,16 @@
+--- iperf-2.0.5/m4/dast.m4.orig 2016-06-15 11:42:03.945581785 -0400
++++ iperf-2.0.5/m4/dast.m4 2016-06-15 11:42:11.053581641 -0400
+@@ -11,7 +11,12 @@
+
+ AC_DEFUN(DAST_CHECK_BOOL, [
+
+-AC_CHECK_SIZEOF(bool)
++if test "$ac_cv_header_stdbool_h" = yes; then
++ AC_CHECK_SIZEOF(bool,,[#include <stdbool.h>])
++else
++ AC_CHECK_SIZEOF(bool)
++fi
++
+ if test "$ac_cv_sizeof_bool" = 0 ; then
+ AC_DEFINE(bool, int)
+ fi
diff --git a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
index b9709f10ad..a9e0d87299 100644
--- a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
+++ b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e8478eae9f479e39bc34975193360298"
SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf/${BP}.tar.gz \
file://iperf-2.0.5_ManPage.patch \
file://0001-fix-out-of-tree-config.patch \
+ file://0002-fix-bool-size-m4.patch \
"
SRC_URI[md5sum] = "44b5536b67719f4250faed632a3cd016"
@@ -17,6 +18,3 @@ S = "${WORKDIR}/${BP}"
inherit autotools pkgconfig
EXTRA_OECONF = "--exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
-
-# http://errors.yoctoproject.org/Errors/Details/68671/
-PNBLACKLIST[iperf] ?= "BROKEN: fails to build with gcc-6"