blob: 1b7f1150835f8fe745acb5cb2848a33787796c58 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 2b0436f9a07773fae8c74df902d7024e8bfc3512 Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 24 Nov 2015 16:46:27 +0200
4Subject: [PATCH] introspection.m4: prefix pkgconfig paths with
5 PKG_CONFIG_SYSROOT_DIR
6
7We can't use our tweaked introspection.m4 from gobject-introspection tarball
8because gstreamer also defines INTROSPECTION_INIT in its introspection.m4, which
9is later supplied to g-ir-scanner.
10
11Upstream-Status: Pending [review on oe-core list]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080013
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050014---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080015 common/m4/introspection.m4 | 8 ++++----
16 1 file changed, 4 insertions(+), 4 deletions(-)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050017
18diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080019index 162be57..933f979 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050020--- a/common/m4/introspection.m4
21+++ b/common/m4/introspection.m4
22@@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
23 INTROSPECTION_GIRDIR=
24 INTROSPECTION_TYPELIBDIR=
25 if test "x$found_introspection" = "xyes"; then
26- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
27- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
28- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
29+ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
30+ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
31+ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
32 INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
33 INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
34 INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
35 INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
36- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
37+ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
38 INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);"
39 fi
40 AC_SUBST(INTROSPECTION_SCANNER)