[gobject-introspection] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR environment variable
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR environment variable
- Date: Tue, 17 Dec 2019 17:06:46 +0000 (UTC)
commit 3d4ed1dbccd3b7cf379fdff263be2af58fd35807
Author: Alexander Kanavin <alex kanavin gmail com>
Date: Thu Oct 8 18:30:35 2015 +0300
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.
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 0513a4c8..b0ccd689 100644
--- a/m4/introspection.m4
+++ b/m4/introspection.m4
@@ -102,14 +102,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 --define-variable=datadir="${_GI_EXP_DATADIR}" --variable=girdir
gobject-introspection-1.0`
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --define-variable=libdir="${_GI_EXP_LIBDIR}"
--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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]