summaryrefslogtreecommitdiffstats
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
parent6f45b92f5f45a904e04576fc4e8f8714163686ea (diff)
downloadmeta-openembedded-50cf14b46281c02613b1792381f1863e7e29ded7.tar.gz
glcompbench: Fix build with gcc7
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-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 000000000..deb60161c
--- /dev/null
+++ b/meta-oe/recipes-graphics/glcompbench/glcompbench/0001-waf-Disable-errors-due-to-Wdeprecated.patch
@@ -0,0 +1,31 @@
1From 49297e2fbe0420a255cbe67989d0ec539125412c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Apr 2017 10:38:24 -0700
4Subject: [PATCH] waf: Disable errors due to -Wdeprecated
5
6throw() has been deprecated in c++11 and removed
7from c++17, gcc7 is more pedandic about this warning
8we therefore add a workaround to ignore this warning
9for now.
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 wscript | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/wscript b/wscript
17index 485a9fb..7f59761 100644
18--- a/wscript
19+++ b/wscript
20@@ -79,7 +79,7 @@ def configure(ctx):
21 ctx.check_cfg(package = pkg, uselib_store = uselib, args = '--cflags --libs',
22 mandatory = True)
23
24- ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -std=c++11 -Wextra'.split(' '))
25+ ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -std=c++11 -Wextra -Wno-error=deprecated'.split(' '))
26
27 # Prepend -O# and -g flags so that they can be overriden by the CFLAGS environment variable
28 if Options.options.opt:
29--
302.12.2
31
diff --git a/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb b/meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb
index 7cf9692f6..e8465855d 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}.
11 file://Fix_space_issues.patch \ 11 file://Fix_space_issues.patch \
12 file://Fix_auto_ptr_deprecated.patch \ 12 file://Fix_auto_ptr_deprecated.patch \
13 file://0001-build-Specify-std-c-11-on-cmdline.patch \ 13 file://0001-build-Specify-std-c-11-on-cmdline.patch \
14" 14 file://0001-waf-Disable-errors-due-to-Wdeprecated.patch \
15 "
15 16
16SRC_URI[md5sum] = "c939d9156fe940960098f38707fea827" 17SRC_URI[md5sum] = "c939d9156fe940960098f38707fea827"
17SRC_URI[sha256sum] = "b04b738cec06c6786ceafa86e4735fd8b971c078265754854ef356b0379542ee" 18SRC_URI[sha256sum] = "b04b738cec06c6786ceafa86e4735fd8b971c078265754854ef356b0379542ee"