[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/28] configure: preserve PKG_CONFIG for subdir builds
From: |
Alex Bennée |
Subject: |
[PULL 19/28] configure: preserve PKG_CONFIG for subdir builds |
Date: |
Thu, 26 Sep 2019 19:35:44 +0100 |
The slirp sub-module complains about not being able to find the glib
library on cross-compiles because it is using the default pkg-config
tool (which isn't installed in our cross-build docker images).
Preserve PKG_CONFIG in our host config and pass it down to slirp.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/Makefile b/Makefile
index a0c1430b40..8da33595ed 100644
--- a/Makefile
+++ b/Makefile
@@ -510,7 +510,11 @@ capstone/all: .git-submodule-status
.PHONY: slirp/all
slirp/all: .git-submodule-status
- $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp
BUILD_DIR="$(BUILD_DIR)/slirp" CC="$(CC)" AR="$(AR)" LD="$(LD)"
RANLIB="$(RANLIB)" CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)")
+ $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp \
+ BUILD_DIR="$(BUILD_DIR)/slirp" \
+ PKG_CONFIG="$(PKG_CONFIG)" \
+ CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" \
+ CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)")
# Compatibility gunk to keep make working across the rename of targets
# for recursion, to be removed some time after 4.1.
diff --git a/configure b/configure
index 397bb476e1..542f6aea3f 100755
--- a/configure
+++ b/configure
@@ -7302,6 +7302,7 @@ echo "OBJCOPY=$objcopy" >> $config_host_mak
echo "LD=$ld" >> $config_host_mak
echo "RANLIB=$ranlib" >> $config_host_mak
echo "NM=$nm" >> $config_host_mak
+echo "PKG_CONFIG=$pkg_config_exe" >> $config_host_mak
echo "WINDRES=$windres" >> $config_host_mak
echo "CFLAGS=$CFLAGS" >> $config_host_mak
echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak
--
2.20.1
- [PULL 08/28] target/ppc: fix signal delivery for ppc64abi32, (continued)
- [PULL 08/28] target/ppc: fix signal delivery for ppc64abi32, Alex Bennée, 2019/09/26
- [PULL 10/28] tests/docker: fix DOCKER_PARTIAL_IMAGES, Alex Bennée, 2019/09/26
- [PULL 07/28] target/alpha: Tidy helper_fp_exc_raise_s, Alex Bennée, 2019/09/26
- [PULL 11/28] tests/docker: remove python2.7 from debian9-mxe, Alex Bennée, 2019/09/26
- [PULL 13/28] podman: fix command invocation, Alex Bennée, 2019/09/26
- [PULL 14/28] tests/tcg: clean-up some comments after the de-tangling, Alex Bennée, 2019/09/26
- [PULL 24/28] docker: remove 'deprecated' image definitions, Alex Bennée, 2019/09/26
- [PULL 12/28] tests/docker: reduce scary warnings by cleaning up clean up, Alex Bennée, 2019/09/26
- [PULL 17/28] tests/tcg: add generic version of float_convs, Alex Bennée, 2019/09/26
- [PULL 26/28] docker: remove unused debian-sid, Alex Bennée, 2019/09/26
- [PULL 19/28] configure: preserve PKG_CONFIG for subdir builds,
Alex Bennée <=
- [PULL 22/28] docker: remove debian8-mxe definitions, Alex Bennée, 2019/09/26
- [PULL 25/28] docker: remove unused debian-ports, Alex Bennée, 2019/09/26
- [PULL 27/28] docker: move tests from python2 to python3, Alex Bennée, 2019/09/26
- [PULL 18/28] tests/tcg: add simple record/replay smoke test for aarch64, Alex Bennée, 2019/09/26
- [PULL 23/28] docker: remove unused debian8 partial image, Alex Bennée, 2019/09/26
- [PULL 28/28] tests/docker: remove debian-powerpc-user-cross, Alex Bennée, 2019/09/26
- [PULL 20/28] docs/devel: add "check-tcg" to testing.rst, Alex Bennée, 2019/09/26
- [PULL 21/28] target/i386: Fix broken build with WHPX enabled, Alex Bennée, 2019/09/26
- [PULL 15/28] tests/tcg: re-enable linux-test for ppc64abi32, Alex Bennée, 2019/09/26
- [PULL 16/28] tests/tcg: add float_madds test to multiarch, Alex Bennée, 2019/09/26