| Brad Bishop | 35a7742 | 2020-05-26 13:25:03 -0400 | [diff] [blame^] | 1 | From 740d91151ffe576e0c08513af9d7bc8133eb9dfb Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Thu, 8 Oct 2015 18:30:35 +0300 |
| 4 | Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR |
| 5 | environment variable |
| 6 | |
| 7 | This environment variable sets the location of sysroot directory in cross-compilation |
| 8 | environments; if the variable is not set, the prefix will be empty. |
| 9 | |
| 10 | Upstream-Status: Pending [review on oe-core list] |
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 12 | |
| 13 | --- |
| 14 | m4/introspection.m4 | 8 ++++---- |
| 15 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 16 | |
| 17 | diff --git a/m4/introspection.m4 b/m4/introspection.m4 |
| 18 | index d89c3d9..b562266 100644 |
| 19 | --- a/m4/introspection.m4 |
| 20 | +++ b/m4/introspection.m4 |
| 21 | @@ -56,14 +56,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
| 22 | INTROSPECTION_GIRDIR= |
| 23 | INTROSPECTION_TYPELIBDIR= |
| 24 | if test "x$found_introspection" = "xyes"; then |
| 25 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
| 26 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
| 27 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
| 28 | + INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
| 29 | + INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
| 30 | + INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
| 31 | INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
| 32 | INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
| 33 | INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
| 34 | INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
| 35 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
| 36 | + INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
| 37 | fi |
| 38 | AC_SUBST(INTROSPECTION_SCANNER) |
| 39 | AC_SUBST(INTROSPECTION_COMPILER) |