glmark2: Fix gcc 6 configure error
PATCH 1/2 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 <[email protected]>
--- .../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
meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch new file +13 -0
@@ -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)
meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +2 -3
@@ -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"
Signature · 1 line
1.9.1
PATCH 2/2 glmark2: Fix gcc 6 deprecated declaration error
Replace auto_ptr with unique_ptr.
Upstream-Status: Pending
Signed-off-by Tom Hochstein <[email protected]>
--- .../files/Fix-deprecated-declarations.patch | 61 ++++++++++++++++++++++ meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 3 +- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-benchmark/glmark2/files/Fix-deprecated-declarations.patch
meta-oe/recipes-benchmark/glmark2/files/Fix-deprecated-declarations.patch new file +61 -0
@@ -0,0 +1,61 @@ +Index: git/src/image-reader.cpp +=================================================================== +--- git.orig/src/image-reader.cpp 2016-07-29 16:17:51.000000000 -0500 ++++ git/src/image-reader.cpp 2016-07-29 16:18:43.000000000 -0500 +@@ -120,7 +120,7 @@ + + Log::debug("Reading PNG file %s\n", filename.c_str()); + +- const std::auto_ptr<std::istream> is_ptr(Util::get_resource(filename)); ++ const std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename)); + if (!(*is_ptr)) { + Log::error("Cannot open file %s!\n", filename.c_str()); + return false; +Index: git/src/libmatrix/shader-source.cc +=================================================================== +--- git.orig/src/libmatrix/shader-source.cc 2016-07-29 16:18:14.000000000 -0500 ++++ git/src/libmatrix/shader-source.cc 2016-07-29 16:18:43.000000000 -0500 +@@ -34,7 +34,7 @@ + bool + ShaderSource::load_file(const std::string& filename, std::string& str) + { +- std::auto_ptr<std::istream> is_ptr(Util::get_resource(filename)); ++ std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename)); + std::istream& inputFile(*is_ptr); + + if (!inputFile) +Index: git/src/model.cpp +=================================================================== +--- git.orig/src/model.cpp 2016-07-29 16:18:00.000000000 -0500 ++++ git/src/model.cpp 2016-07-29 16:18:43.000000000 -0500 +@@ -361,7 +361,7 @@ + + Log::debug("Loading model from 3ds file '%s'\n", filename.c_str()); + +- const std::auto_ptr<std::istream> input_file_ptr(Util::get_resource(filename)); ++ const std::unique_ptr<std::istream> input_file_ptr(Util::get_resource(filename)); + std::istream& input_file(*input_file_ptr); + + if (!input_file) { +@@ -681,7 +681,7 @@ + { + Log::debug("Loading model from obj file '%s'\n", filename.c_str()); + +- const std::auto_ptr<std::istream> input_file_ptr(Util::get_resource(filename)); ++ const std::unique_ptr<std::istream> input_file_ptr(Util::get_resource(filename)); + std::istream& inputFile(*input_file_ptr); + if (!inputFile) + { +Index: git/src/scene-jellyfish.cpp +=================================================================== +--- git.orig/src/scene-jellyfish.cpp 2016-07-29 16:18:08.000000000 -0500 ++++ git/src/scene-jellyfish.cpp 2016-07-29 16:18:43.000000000 -0500 +@@ -272,7 +272,7 @@ + { + Log::debug("Loading model from file '%s'\n", filename.c_str()); + +- const std::auto_ptr<std::istream> input_file_ptr(Util::get_resource(filename)); ++ const std::unique_ptr<std::istream> input_file_ptr(Util::get_resource(filename)); + std::istream& inputFile(*input_file_ptr); + if (!inputFile) + {
meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +2 -1
@@ -15,7 +15,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://Fix-configure-for-sqrt-check.patch" + file://Fix-configure-for-sqrt-check.patch \ + file://Fix-deprecated-declarations.patch" SRCREV = "fa71af2dfab711fac87b9504b6fc9862f44bf72a" S = "${WORKDIR}/git"
Signature · 1 line
1.9.1