| From 740d91151ffe576e0c08513af9d7bc8133eb9dfb Mon Sep 17 00:00:00 2001 |
| From: Alexander Kanavin <alex.kanavin@gmail.com> |
| Date: Thu, 8 Oct 2015 18:30:35 +0300 |
| Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR |
| environment variable |
| |
| This environment variable sets the location of sysroot directory in cross-compilation |
| environments; if the variable is not set, the prefix will be empty. |
| |
| Upstream-Status: Pending [review on oe-core list] |
| Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| |
| --- |
| m4/introspection.m4 | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/m4/introspection.m4 b/m4/introspection.m4 |
| index d89c3d9..b562266 100644 |
| --- a/m4/introspection.m4 |
| +++ b/m4/introspection.m4 |
| @@ -56,14 +56,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 |
| fi |
| AC_SUBST(INTROSPECTION_SCANNER) |
| AC_SUBST(INTROSPECTION_COMPILER) |