1From e0bf97eecfa601e08b9578f00b1000890284241a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 27 Oct 2015 16:02:19 +0200
4Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
5 from pkg-config with PKG_CONFIG_SYSROOT_DIR
6
7See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for
8reasons why this is not approproiate for upstream submission.
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13---
14 Source/cmake/FindGObjectIntrospection.cmake | 4 +++-
15 1 file changed, 3 insertions(+), 1 deletion(-)
16
17diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake
18index be96814a..ae67b593 100644
19--- a/Source/cmake/FindGObjectIntrospection.cmake
20+++ b/Source/cmake/FindGObjectIntrospection.cmake
21@@ -16,7 +16,6 @@
22 # Redistribution and use is allowed according to the terms of the BSD license.
23
24
25-
26 find_package(PkgConfig QUIET)
27 if (PKG_CONFIG_FOUND)
28     if (PACKAGE_FIND_VERSION_COUNT GREATER 0)
29@@ -30,6 +29,9 @@ if (PKG_CONFIG_FOUND)
30         pkg_get_variable(INTROSPECTION_GENERATE gobject-introspection-1.0 g_ir_generate)
31         pkg_get_variable(INTROSPECTION_GIRDIR gobject-introspection-1.0 girdir)
32         pkg_get_variable(INTROSPECTION_TYPELIBDIR gobject-introspection-1.0 typelibdir)
33+        set(INTROSPECTION_SCANNER "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_SCANNER}")
34+        set(INTROSPECTION_COMPILER "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_COMPILER}")
35+        set(INTROSPECTION_GENERATE "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_GENERATE}")
36         set(INTROSPECTION_VERSION "${_pc_gir_VERSION}")
37         if (${INTROSPECTION_VERSION} VERSION_GREATER_EQUAL "1.59.1")
38             set(INTROSPECTION_HAVE_SOURCES_TOP_DIRS YES)
39