From patchwork Thu Sep 19 17:10:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 174074 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1300984ill; Thu, 19 Sep 2019 10:24:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqzccJu0TOwQPDNWyLZsxeZsCCNwAneTQPykhpq7G5Qom9lSf2LlaXHi5QmbkQgWO7jTOaGD X-Received: by 2002:aa7:ce88:: with SMTP id y8mr17629592edv.145.1568913886932; Thu, 19 Sep 2019 10:24:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568913886; cv=none; d=google.com; s=arc-20160816; b=PeAie68baz3Eel3tA0eumOTYqZQIndQ0sOoH3/o+vy87w7jRkHD92hJh58NahMNzqK KQgrVyJ8vXiOmwJb6dtswvRCy/In6gAQAJzyGY4I0ygAfUR71bY0zCOt0iZt/n8IKOes ENfseDCD2+SljsV4Qz1DH42hoJ3sGQocwIh3ZHQAGgc0rMZj38cV9mXKv9rslFgQ1eO7 43wo/hCESMLmPCnLqsorus0LzprisN0wOPr5RIoWF3dZbDob4h4Ac5a41d0JGxtypffN lsVXkU8KwCf/At7tRi+jwKkiL5dkGCUaxshKK/9vMnpJ7994aQgzNv0nxSUBHp4Lt/Em QysA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=FEApLzz8EuHV+XBsNFul7xa5XssJJY+Lsb1MZ6+FuAA=; b=HhZGEdBMu3SfsF/eUfXg1WwYw0g6Rxr17V3XGh8JpEg3pUCS8qWhkxAQOLPH+7lnm0 UgYrbsxpGRRcFwx7YYtUgddf14l67qqNhKUSRyBry8cG8AdcN8VtbMj9YQT9ctGRlU/p o/MX96BBV1DDg2tbIrJKgWjYCLO2cj6B4g0i9h3zE1C+ImouC9thspw4WNM5K66fV/z0 HM/6y2motePrWf+VuSoRRTnQNbZWlNpgetlsn7rkFgRZwEWOKN9BNU3Yl21kKafhJ1wq 68L0Buw1/kZU/lWWJiA3VSG8hNGZe69QAXIgQOg5/GWr9eH76JCIuLYbWPpgaOO9dH6i v6Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WbJY7zRH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w20si6056026edc.202.2019.09.19.10.24.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Sep 2019 10:24:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WbJY7zRH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iB0Ae-0001qG-Q5 for patch@linaro.org; Thu, 19 Sep 2019 13:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50104) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iB06q-0008Ns-Le for qemu-devel@nongnu.org; Thu, 19 Sep 2019 13:20:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iB05n-0000PG-Be for qemu-devel@nongnu.org; Thu, 19 Sep 2019 13:19:44 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:51650) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iB05n-0000Oh-44 for qemu-devel@nongnu.org; Thu, 19 Sep 2019 13:19:43 -0400 Received: by mail-wm1-x344.google.com with SMTP id 7so5580613wme.1 for ; Thu, 19 Sep 2019 10:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FEApLzz8EuHV+XBsNFul7xa5XssJJY+Lsb1MZ6+FuAA=; b=WbJY7zRH3FBZJID4Msl3iQLfATLOJAVeGd2ybGuFZIMZMUlMCOLQujs0NmUQHGfOme 1H0AvesJ+qAaFDqO2OTNbp1K08pEU/3RwJGMgmWpaDfIlBSuCx+FQVgGBv/Li5hwYZXc voerk9OkoIUf8bKpBchw5Q2lU9gMbpJMDS982ccohsZppkxySp5OPFphuqlTj0nYXxpd Cj1ApVaReI6hzQyYaoA2RzKFA8LOXhMxhSKwOSJMDNIgcQ+Z8N9cqPBG9a33Lqvnx4gv +5ozAw+mjiW2+0LD88cFXyJ4VOK4hAAEy+VOWqOW4OQEQLm0cujwlq4Fo5RpGt8Cv0Rb /aTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FEApLzz8EuHV+XBsNFul7xa5XssJJY+Lsb1MZ6+FuAA=; b=IufINyblZQV+4eRygmpHcdKX5w0Y7EHncOLBPLzZAlronat+JOAy8P4a2g+mUeTaJ6 ZiESlbyc0zxgglOu3gBLKZnc7bWhbE4CU6Bbw0Y7Xi2p9XoByrPWQIYW7QF8ooBfxrxB BM6saGmK88vfxlUtzcQGBj+C5jZjfDxnCzj9cS+F6ZHxf6rwi36frM7GKTelm/9l35da 57pQS92EY62uFTBMsJrAXuzGcJOcxFElqGePtJC6wARFE9yjC52rCIiwKTu6AX+ReY/f YsEJaFYcflrFJq6dGEWElt+AeyRZUhP8BX29DRaTYzN++aSbQLoJvdZ7oBGbbqeIc1xU ftnQ== X-Gm-Message-State: APjAAAU2Ekp3IgISqhDCTxdhR8mfZr03vzMlWygkZPEL51J6+HAc22Jz 7NNCoL7VEHHZDtsTRg8z/TDQ7Q== X-Received: by 2002:a1c:2bc7:: with SMTP id r190mr4099465wmr.143.1568913582083; Thu, 19 Sep 2019 10:19:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s1sm14108473wrg.80.2019.09.19.10.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 10:19:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1543E1FF9E; Thu, 19 Sep 2019 18:10:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 14/16] configure: preserve PKG_CONFIG for subdir builds Date: Thu, 19 Sep 2019 18:10:13 +0100 Message-Id: <20190919171015.12681-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190919171015.12681-1-alex.bennee@linaro.org> References: <20190919171015.12681-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- Makefile | 6 +++++- configure | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Richard Henderson 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