aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-23 22:20:54 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-04-26 20:13:31 +0200
commit50cf14b46281c02613b1792381f1863e7e29ded7 (patch)
tree9eb79fb8f18419ab947cfce5aefa2afa4c052ca2 /meta-oe/recipes-graphics
parent6f45b92f5f45a904e04576fc4e8f8714163686ea (diff)
downloadmeta-openembedded-contrib-50cf14b46281c02613b1792381f1863e7e29ded7.tar.gz
meta-openembedded-contrib-50cf14b46281c02613b1792381f1863e7e29ded7.tar.bz2
meta-openembedded-contrib-50cf14b46281c02613b1792381f1863e7e29ded7.zip
glcompbench: Fix build with gcc7
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r--meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch31
-rwxr-xr-xmeta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb3
2 files changed, 33 insertions, 1 deletions
diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch b/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch
new file mode 100644
index 0000000000..deb60161ca
--- /dev/null
+++ b/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch
@@ -0,0 +1,31 @@
+From 49297e2fbe0420a255cbe67989d0ec539125412c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 23 Apr 2017 10:38:24 -0700
+Subject: [PATCH] waf: Disable errors due to -Wdeprecated
+
+throw() has been deprecated in c++11 and removed
+from c++17, gcc7 is more pedandic about this warning
+we therefore add a workaround to ignore this warning
+for now.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 485a9fb..7f59761 100644
+--- a/wscript
++++ b/wscript
+@@ -79,7 +79,7 @@ def configure(ctx):
+ ctx.check_cfg(package = pkg, uselib_store = uselib, args = '--cflags --libs',
+ mandatory = True)
+
+- ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -std=c++11 -Wextra'.split(' '))
++ ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -std=c++11 -Wextra -Wno-error=deprecated'.split(' '))
+
+ # Prepend -O# and -g flags so that they can be overriden by the CFLAGS environment variable
+ if Options.options.opt:
+--
+2.12.2
+
diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb b/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb
index 7cf9692f66..e8465855dd 100755
--- a/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb
+++ b/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb
@@ -11,7 +11,8 @@ SRC_URI = "https://launchpad.net/glcompbench/trunk/${PV}/+download/${BPN}-${PV}.
file://Fix_space_issues.patch \
file://Fix_auto_ptr_deprecated.patch \
file://0001-build-Specify-std-c-11-on-cmdline.patch \
-"
+ file://0001-waf-Disable-errors-due-to-Wdeprecated.patch \
+ "
SRC_URI[md5sum] = "c939d9156fe940960098f38707fea827"
SRC_URI[sha256sum] = "b04b738cec06c6786ceafa86e4735fd8b971c078265754854ef356b0379542ee"