diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-21 08:09:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-12 08:51:09 +0100 |
commit | 99df0c34705006cbab9de58bf6b796728a295b7a (patch) | |
tree | 36795369ee372b623d083350b3942f5bc0f85d69 /meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch | |
parent | 2b070ef738a30f23963fed4bec3470557a5dc2a3 (diff) | |
download | poky-99df0c34705006cbab9de58bf6b796728a295b7a.tar.gz |
webkitgtk: Upgrade to 2.16.1
Fix build with gcc7
Move all patches to webkit folder
Drop patches that were backports or have been upstreamed
(From OE-Core rev: bfbdd1a2069f199be9ba0909dd512469ff17b65e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch new file mode 100644 index 0000000000..fae3b0b2e5 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 317a5ac120c44987219bc03486cd2f2d1842c9b9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 27 Oct 2015 16:02:19 +0200 | ||
4 | Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained | ||
5 | from pkg-config with PKG_CONFIG_SYSROOT_DIR | ||
6 | |||
7 | Upstream-Status: Pending [review on oe-core list] | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | Source/cmake/FindGObjectIntrospection.cmake | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake | ||
14 | index e1f49b4..03a4446 100644 | ||
15 | --- a/Source/cmake/FindGObjectIntrospection.cmake | ||
16 | +++ b/Source/cmake/FindGObjectIntrospection.cmake | ||
17 | @@ -26,6 +26,7 @@ macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname _extra_args) | ||
18 | else () | ||
19 | string(REGEX REPLACE "[\r\n]" " " _result "${_result}") | ||
20 | string(REGEX REPLACE " +$" "" _result "${_result}") | ||
21 | + string(CONCAT _result $ENV{PKG_CONFIG_SYSROOT_DIR} "${_result}") | ||
22 | separate_arguments(_result) | ||
23 | set(${_outvar} ${_result} CACHE INTERNAL "") | ||
24 | endif () | ||
25 | -- | ||
26 | 2.1.4 | ||
27 | |||