43 lines
2.4 KiB
Diff
43 lines
2.4 KiB
Diff
|
From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
Date: Tue, 24 Nov 2015 16:46:27 +0200
|
||
|
|
Subject: [PATCH] introspection.m4: prefix pkgconfig paths with
|
||
|
|
PKG_CONFIG_SYSROOT_DIR
|
||
|
|
|
||
|
|
We can't use our tweaked introspection.m4 from gobject-introspection tarball
|
||
|
|
because gstreamer also defines INTROSPECTION_INIT in its introspection.m4, which
|
||
|
|
is later supplied to g-ir-scanner.
|
||
|
|
|
||
|
|
Upstream-Status: Pending [review on oe-core list]
|
||
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
---
|
||
|
|
common/m4/introspection.m4 | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4
|
||
|
|
index 162be57..217a6ae 100644
|
||
|
|
--- a/common/m4/introspection.m4
|
||
|
|
+++ b/common/m4/introspection.m4
|
||
|
|
@@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
|
||
|
|
INTROSPECTION_GIRDIR=
|
||
|
|
INTROSPECTION_TYPELIBDIR=
|
||
|
|
if test "x$found_introspection" = "xyes"; then
|
||
|
|
- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
|
||
|
|
- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
||
|
|
- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
||
|
|
+ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
|
||
|
|
+ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
||
|
|
+ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
||
|
|
INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
|
||
|
|
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
|
||
|
|
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
|
||
|
|
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
|
||
|
|
- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
|
||
|
|
+ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
|
||
|
|
INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);"
|
||
|
|
fi
|
||
|
|
AC_SUBST(INTROSPECTION_SCANNER)
|
||
|
|
--
|
||
|
|
2.6.2
|
||
|
|
|