summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-01-30 22:50:15 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-02 11:06:00 +0000
commitbf052c5be7ed19b73e7db5e974b1efcfe5bdfc97 (patch)
treed14ad0b28914a7844e3b8a3c4be85d232846b4c6 /meta/recipes-sato/webkit
parented9414e1b8498f08421847ee260552f5169ee1c4 (diff)
downloadpoky-bf052c5be7ed19b73e7db5e974b1efcfe5bdfc97.tar.gz
webkitgtk: Fix build with clang/libc++ >= 7.0.0
(From OE-Core rev: 8f77aeb09504beeb7dd0fcb301543819dfb16673) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch35
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.22.5.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch b/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch
new file mode 100644
index 0000000000..9d0d50b79e
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/bad_optional_access.patch
@@ -0,0 +1,35 @@
1unbreak build with libc++ 7
2
3based on
4https://svnweb.freebsd.org/ports/head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h?view=markup&pathrev=477812
5
6Fixes
7
8/usr/include/c++/v1/optional:171:29: error: redefinition of 'bad_optional_access'
9class _LIBCPP_EXCEPTION_ABI bad_optional_access
10 ^
11DerivedSources/ForwardingHeaders/wtf/Optional.h:295:7: note: previous definition is here
12class bad_optional_access : public std::logic_error {
13 ^
14
15Upstream-Status: Pending
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17--- a/Source/WTF/wtf/Optional.h
18+++ b/Source/WTF/wtf/Optional.h
19@@ -276,14 +276,14 @@ struct nullopt_t
20 };
21 constexpr nullopt_t nullopt{nullopt_t::init()};
22
23-
24+# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000
25 // 20.5.8, class bad_optional_access
26 class bad_optional_access : public std::logic_error {
27 public:
28 explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
29 explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
30 };
31-
32+# endif // _LIBCPP_VERSION < 7000
33
34 template <class T>
35 union storage_t
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb
index e3579e472b..3d8c0338c7 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb
@@ -20,6 +20,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
20 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 20 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
21 file://0001-Fix-build-with-musl.patch \ 21 file://0001-Fix-build-with-musl.patch \
22 file://detect-gstreamer-gl.patch \ 22 file://detect-gstreamer-gl.patch \
23 file://bad_optional_access.patch \
23 " 24 "
24 25
25SRC_URI[md5sum] = "96a731522b800f38e70f85c22f8de477" 26SRC_URI[md5sum] = "96a731522b800f38e70f85c22f8de477"