Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From dbb1c58e86f2af4613f3ac9571d9b163d4bca675 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 23 Oct 2015 16:13:54 +0300 |
| 4 | Subject: [PATCH] vapigen.m4: use $PKG_CONFIG_SYSROOT_DIR |
| 5 | |
| 6 | This is necessary in cross-compiling environments, where directories |
| 7 | returned by pkg-config should be prefixed with sysroot location. |
| 8 | |
| 9 | Upstream-Status: Pending [review in oe-core list] |
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 11 | --- |
| 12 | vapigen/vapigen.m4 | 8 ++++---- |
| 13 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 14 | |
| 15 | diff --git a/vapigen/vapigen.m4 b/vapigen/vapigen.m4 |
| 16 | index 2c435e7..6228991 100644 |
| 17 | --- a/vapigen/vapigen.m4 |
| 18 | +++ b/vapigen/vapigen.m4 |
| 19 | @@ -82,12 +82,12 @@ AC_DEFUN([VAPIGEN_CHECK], |
| 20 | |
| 21 | AS_CASE([$enable_vala], |
| 22 | [yes], [ |
| 23 | - VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name` |
| 24 | - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen |
| 25 | + VAPIGEN=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name` |
| 26 | + VAPIGEN_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen |
| 27 | AS_IF([test "x$2" = "x"], [ |
| 28 | - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name` |
| 29 | + VAPIGEN_VAPIDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name` |
| 30 | ], [ |
| 31 | - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name` |
| 32 | + VAPIGEN_VAPIDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name` |
| 33 | ]) |
| 34 | ]) |
| 35 | |
| 36 | -- |
| 37 | 2.1.4 |
| 38 | |