mirror of
https://git.yoctoproject.org/poky
synced 2026-07-27 07:27:12 +00:00
Alexander Kanavin
80dc146207
Upstream has rewritten gobject introspection support, so the two related patches are ported to that: 0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch 0001-When-building-introspection-files-do-not-quote-CFLAG.patch The latter patch is also promoted from Inappropriate to Pending gtk-doc has been replaced with gi-docgen, accordingly 0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch is removed. Drop fix-gstreamer-include-paths.patch (backport) 0001-Fix-build-without-opengl-or-es.patch (upstream fixed the issue; follow the link in the patch for details) (From OE-Core rev: ac06af29503d2d3e0e43ef69d1d1580ce301bdfb) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 10cfdcc905915d8814c609008a069102f2bc7e39 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@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
|
|
|
|
See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for
|
|
reasons why this is not approproiate for upstream submission.
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
---
|
|
Source/cmake/FindGI.cmake | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
|
|
index af039cbb..b3e810cd 100644
|
|
--- a/Source/cmake/FindGI.cmake
|
|
+++ b/Source/cmake/FindGI.cmake
|
|
@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND)
|
|
endif ()
|
|
endif ()
|
|
|
|
+set(_GI_SCANNER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_SCANNER_EXE}")
|
|
+set(_GI_COMPILER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_COMPILER_EXE}")
|
|
+
|
|
find_program(GI_SCANNER_EXE NAMES ${_GI_SCANNER_EXE} g-ir-scanner)
|
|
find_program(GI_COMPILER_EXE NAMES ${_GI_COMPILER_EXE} g-ir-compiler)
|
|
|