From c29c7ed7642c9e58a8e46f24a3d29e9dfed7da5a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 8 Aug 2016 11:39:54 -0500 Subject: glmark2: Fix gcc 6 configure error Remove the un-necessary check for sqrt and avoid a gcc 6 configure error. Upstream-Status: Submitted [Pull request: a39907dd19726b2df3bac29a4bdc59d1bd0922a1] Signed-off-by: Tom Hochstein Signed-off-by: Martin Jansa --- .../glmark2/files/Fix-configure-for-sqrt-check.patch | 13 +++++++++++++ meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch (limited to 'meta-oe/recipes-benchmark') diff --git a/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch b/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch new file mode 100644 index 0000000000..fde82381d5 --- /dev/null +++ b/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch @@ -0,0 +1,13 @@ +Index: git/wscript +=================================================================== +--- git.orig/wscript 2016-07-29 13:15:44.954249796 -0500 ++++ git/wscript 2016-07-29 15:52:06.196768865 -0500 +@@ -90,7 +90,7 @@ + ctx.check_cxx(lib = lib, uselib_store = uselib) + + # Check required functions +- req_funcs = [('memset', 'string.h', []) ,('sqrt', 'math.h', ['m'])] ++ req_funcs = [('memset', 'string.h', [])] + for func, header, uselib in req_funcs: + ctx.check_cxx(function_name = func, header_name = header, + uselib = uselib, mandatory = True) diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 9c5ef1810d..18267e96f7 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -14,7 +14,8 @@ PV = "2014.03+${SRCPV}" SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ - file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch" + file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch \ + file://Fix-configure-for-sqrt-check.patch" SRCREV = "fa71af2dfab711fac87b9504b6fc9862f44bf72a" S = "${WORKDIR}/git" @@ -51,5 +52,3 @@ python __anonymous() { d.appendVar("EXTRA_OECONF", " --with-flavors=%s" % ",".join(flavors)) } -# http://errors.yoctoproject.org/Errors/Details/68626/ -PNBLACKLIST[glmark2] ?= "BROKEN: fails to build with gcc-6" -- cgit 1.2.3-korg