From 0647b7d6400b1c40fc6cb40596e56b852ceb85c5 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Wed, 15 Jun 2016 11:51:11 -0400 Subject: iperf: resolve issues with gcc6 Signed-off-by: Derek Straka Signed-off-by: Martin Jansa --- .../iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch | 16 ++++++++++++++++ meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 4 +--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch (limited to 'meta-oe/recipes-benchmark/iperf') 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 ]) ++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" -- cgit 1.2.3-korg