[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/16] configure: preserve PKG_CONFIG for subdir builds
From: |
Alex Bennée |
Subject: |
[PATCH v2 14/16] configure: preserve PKG_CONFIG for subdir builds |
Date: |
Thu, 19 Sep 2019 18:10:13 +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>
---
Makefile | 6 +++++-
configure | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 111082ce545..3cf5b1e7539 100644
--- a/Makefile
+++ b/Makefile
@@ -499,7 +499,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 30aad233d17..377fbdc9f1b 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
- [PATCH v2 00/16] testing/next (docker/podman, tcg, build fixes), Alex Bennée, 2019/09/19
- [PATCH v2 05/16] podman: fix command invocation, Alex Bennée, 2019/09/19
- [PATCH v2 12/16] tests/docker: Add fedora-win10sdk-cross image, Alex Bennée, 2019/09/19
- [PATCH v2 15/16] docs/devel: add "check-tcg" to testing.rst, Alex Bennée, 2019/09/19
- [PATCH v2 11/16] tests/tcg: add simple record/replay smoke test for aarch64, Alex Bennée, 2019/09/19
- [PATCH v2 14/16] configure: preserve PKG_CONFIG for subdir builds,
Alex Bennée <=
- [PATCH v2 16/16] Makefile: fix-up qemu-ga.8 paths to take in-src builds into account, Alex Bennée, 2019/09/19
- [PATCH v2 13/16] .shippable.yml: Build WHPX enabled binaries, Alex Bennée, 2019/09/19
- [PATCH v2 10/16] tests/tcg: add generic version of float_convs, Alex Bennée, 2019/09/19
[PATCH v2 08/16] tests/tcg: re-enable linux-test for ppc64abi32, Alex Bennée, 2019/09/19