We are moving from freedesktop.org's pkg-config to pkgconf. This enables us to remove the following patch as PKG_CONFIG_SYSROOT_DIR behaves consistently with pkgconf:
1. 0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch Signed-off-by: Maxin B. John <maxin.j...@intel.com> --- ...Introspection.cmake-prefix-variables-obta.patch | 27 ---------------------- meta/recipes-sato/webkit/webkitgtk_2.18.6.bb | 1 - 2 files changed, 28 deletions(-) delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch 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 deleted file mode 100644 index fae3b0b..0000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 317a5ac120c44987219bc03486cd2f2d1842c9b9 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kana...@gmail.com> -Date: Tue, 27 Oct 2015 16:02:19 +0200 -Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained - from pkg-config with PKG_CONFIG_SYSROOT_DIR - -Upstream-Status: Pending [review on oe-core list] -Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> ---- - Source/cmake/FindGObjectIntrospection.cmake | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake -index e1f49b4..03a4446 100644 ---- a/Source/cmake/FindGObjectIntrospection.cmake -+++ b/Source/cmake/FindGObjectIntrospection.cmake -@@ -26,6 +26,7 @@ macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname _extra_args) - else () - string(REGEX REPLACE "[\r\n]" " " _result "${_result}") - string(REGEX REPLACE " +$" "" _result "${_result}") -+ string(CONCAT _result $ENV{PKG_CONFIG_SYSROOT_DIR} "${_result}") - separate_arguments(_result) - set(${_outvar} ${_result} CACHE INTERNAL "") - endif () --- -2.1.4 - diff --git a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb index ff0ff8f..f88306c 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb @@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 " SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ -- 2.4.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core