From patchwork Tue Sep 24 21:00:55 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: 174331 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4768337ill; Tue, 24 Sep 2019 15:59:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqwYKd/xsYjgoPOFlGCZaHREf42mndhuHfreJXdVqlYPcSA2cm1B/mCSnWU2BOSiRrXL/zt1 X-Received: by 2002:a1c:4946:: with SMTP id w67mr3135637wma.131.1569365942180; Tue, 24 Sep 2019 15:59:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569365942; cv=none; d=google.com; s=arc-20160816; b=Aetq2KVJli0iQldXgXC2upkhj23fyZzDxZIHiu2cL7YHHdVSjW1HWfNid2OX7DRm++ h5wyDMuHoLu0dw9drJzRkHkF/2138dtk+AWtZ070xG3cfE9uOCBI143kCpBi5mab5hBQ YVuO+bJyt7jmkwhh/2ACozgkJcGVix4+ih1bYzAef+4mPt9Ni8zzyNPyBJl+nAJ7jVUo RA54b/V+upXCqG1sptJOoDW1h/byAsd2lTX1QuAwf3sau0URPBEehbZZZVR6j/oKpAHk jJR8Kl/5DoJbmA8Cw3VLLgGFX2BqMDzmuehvjFVw44FFmWFAg+Ebmh6EaqPkUESCZIIE vqXg== 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=zK0yuZrTDTwRTBFF7n6uiaAtWncNsTzP6ETmlJNaNAU=; b=q2XuVGljjA+iomv+hjcIvpi3hiAE++hZKm9vWjJ7lmN6X0nH0OfOP37rxUU2+DTG2J NotNqowDjyzUb+pys7vmMogEku1ygsZKN5cs/IBsTj4/n9kvpU4KzmEDrE+y0QH9gV9s nArslLr5fm7ejVCzpqTjx855B914MOTIroueXNebacEFSgJgTafBt7jWnD2Wa42eERox KCmI+ojNOnOK1MCJE67clkn/eFifdfzgvfmYAkE0RDKrZPKXSShXC0UQNNeXQWCypAeO DPfZP5/U/Pdkoi8chxn5un5IKpl2Tx7sHaRMdvqFR3C0xZp+ZH4copGy5PWXuZvlWjQ1 kd7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Zf9WqoE4; 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=fail (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 y7si1693654ejp.378.2019.09.24.15.59.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Sep 2019 15:59:02 -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=fail header.i=@linaro.org header.s=google header.b=Zf9WqoE4; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCtlt-0002FY-69 for patch@linaro.org; Tue, 24 Sep 2019 18:59:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56807) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCs5G-0003Qp-Sv for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCs56-0007a0-0x for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:10:54 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:52764) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iCs55-0007Zr-QG for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:10:43 -0400 Received: by mail-wm1-x341.google.com with SMTP id r19so366880wmh.2 for ; Tue, 24 Sep 2019 14:10: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=zK0yuZrTDTwRTBFF7n6uiaAtWncNsTzP6ETmlJNaNAU=; b=Zf9WqoE4Je9zZcVUhCHtPA5iHtEqIvcSeKkEjz1gKvSblnE0Shd4jDh+To1F8b0EeA 4ps9n+Os7mydX7K22h0Y6LLwtBqeWoeohHF5UHVhx9UJ4TgA3p+3Q2UZL06RYQv9XsSV usoEceUCme/JK6ZTINYaHbcB1etRSKW5adkOcx4vVlI+wOKt5sHORZ9EwmVibZBAtcRv RlLkTgwwsk4qGKerZY97tpkraB+Rkv0iXPqNHt/a2fdcaiSRQ1DguZX2RdV2iOAqsvpS nqmydfjlhSpmbgtWyQe+2mpnGJ7hXEt2na+VR1kEmDox1xKa4xrioZY1DCx2I6XvoWS8 6dww== 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=zK0yuZrTDTwRTBFF7n6uiaAtWncNsTzP6ETmlJNaNAU=; b=WVKH1dhfMlxIpPdMYv0VEjPzOuvm29YCXqaZahVvWnLHUM9uFg3UKZdjbzquphSnYh AXbgdYCJq0m5If3bBG8Q7M1HCw3ZsyNiPNcgQyM6VCSpyghk08PbPqywdiqjJMzlj1kc Snjx7cRKt4+921PHEHrlolqNbRM25M1BCcgNSob1v9OF/xIQBFFxr1PafAyQrP8BN6L5 hGgnNxJSDBh4XAKtVmA7q7406KFJyA3WvSCQqwhQRkENDFYy5AQA0bhGS+su0BBEZxVl qKkUdDfI9pJoW6ttAo138zIh+iy8eRQmXG/KpsLaIcahmTdD3iDGwhxBC3KFF2xntooS 0psw== X-Gm-Message-State: APjAAAX6Bg5nVBcrRW28nRvSHoj9lEZsdJoTxd7I7o22Mxnn4d2SnI65 g4zoY2ShisT1ATYdi/CoiT0ERQ== X-Received: by 2002:a1c:544e:: with SMTP id p14mr2499469wmi.72.1569359442782; Tue, 24 Sep 2019 14:10:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a13sm5202467wrf.73.2019.09.24.14.10.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 14:10:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E39AA1FFAA; Tue, 24 Sep 2019 22:01:08 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 22/33] configure: preserve PKG_CONFIG for subdir builds Date: Tue, 24 Sep 2019 22:00:55 +0100 Message-Id: <20190924210106.27117-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924210106.27117-1-alex.bennee@linaro.org> References: <20190924210106.27117-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::341 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , jsnow@redhat.com, f4bug@amsat.org 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 Reviewed-by: Richard Henderson --- Makefile | 6 +++++- configure | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/Makefile b/Makefile index a0c1430b407..8da33595edd 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 397bb476e19..542f6aea3f6 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