From patchwork Tue Feb 4 14:24:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1233371 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind.be header.i=@mind.be header.a=rsa-sha256 header.s=google header.b=dV8dxIAL; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Bn7Q2xhPzB3xj for ; Wed, 5 Feb 2020 01:26:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 97113851C2; Tue, 4 Feb 2020 14:26:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UkIulhzbkXTC; Tue, 4 Feb 2020 14:26:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E15C084493; Tue, 4 Feb 2020 14:26:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 72D2F1BF3D8 for ; Tue, 4 Feb 2020 14:26:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6E0B085310 for ; Tue, 4 Feb 2020 14:26:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iuEwbpkdJ5cP for ; Tue, 4 Feb 2020 14:26:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2B8278517C for ; Tue, 4 Feb 2020 14:26:20 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id u6so10020934wrt.0 for ; Tue, 04 Feb 2020 06:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RsOP04OjxDrvMTZFZiq4VPPLOnuDlQUBwVgRN9WAjH4=; b=dV8dxIALks92dQiNklCzrPTxUxIg+y3aAlmF3PDDvZp4vMCS4wXEFn/ihkJueyJCf2 ocza0exNi5p0SXLKoAzcVko7J6kfIYxs6cKYCqQGLkqONFQT0CNq6Rn+Gyhd7MGuHF4C Ks0brctFdG/8W/bDrdQSyB44gkHEoP+GL2TFhCOSr9hvnBO9UVbmarie7DTIGkpUNgS2 tRHsOC/RnoC6BEpw0YeOEcrKFC4UmiTIX5j8S/Kuxy8+82RIJ4GccZmNlbTCGwmsG9hT 0NwMHJ9GfpL3CEvKiUrJ0dGyGSyRDHjN/Nlo/vvlJ92NpebjXfXou8omf4s+hYXm8Ylw T8cg== 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=RsOP04OjxDrvMTZFZiq4VPPLOnuDlQUBwVgRN9WAjH4=; b=uneEudWqGl+ljJ/1GurzyP4y5yP1iSsROpPwB/KEPusUBAAcITkzrsf1Yn35XLdQB7 wWlZo1Nzf0knZsmLLx4z3DvQnuTUYg0QuLeF4URKSkorAx0rcM3imIPIvKSA9teiRdGH wgK2iZ4A/7dwn6zOyHpX9XLMSuT3FBDBy37gtuZcEoyEd5KbxZfeuYClm5T1mMInsyRO uJqT9+R7UGHbkafV8bfityguuxLsNXy7CUWoSeaHXuNN0sOv/JzBCOfJY98JtL/9K7Fi ybfkVN8djvee/FqS4YOnFjd2yB8VtIIKWbQMJ5qXHFwjIVC/9yoqUdQCq2W2fAynYReC otow== X-Gm-Message-State: APjAAAX+eu0RL4eBMtXS8iyMbld0A/W2jhb9vIvEEjm+sTDvecFpGeWd 4vkQmqU2YYlRdIwc4SFe+nLvXTGJj6E= X-Google-Smtp-Source: APXvYqxjuSyR0wrSQnp1oeBzYmkT5ZWizCZSs2lZ5sXZiu+1tycqNx+3sjU7DZv8rZWOKQwx2hb2ww== X-Received: by 2002:a5d:6151:: with SMTP id y17mr21972787wrt.110.1580826378422; Tue, 04 Feb 2020 06:26:18 -0800 (PST) Received: from localhost.localdomain ([2620:0:1055:fd00:c6df:61c8:f82e:fd3c]) by smtp.gmail.com with ESMTPSA id a22sm4095191wmd.20.2020.02.04.06.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2020 06:26:17 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Tue, 4 Feb 2020 15:24:56 +0100 Message-Id: <20200204142456.1537358-6-arnout@mind.be> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200204142456.1537358-1-arnout@mind.be> References: <20200204142456.1537358-1-arnout@mind.be> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/5] package/pkg-meson: use TARGET_MAKE_ENV in configure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The configure step doesn't use TARGET_MAKE_ENV, but sets PATH explicitly. Thus, it missed the update of PATH with HOST_BIN_CROSS. Instead of adding it explicitly again, just use TARGET_MAKE_ENV. Yes, it's not really a 'make environment' that we're expecting to use in the configure step, 'conf environment' would make more sense. However, TARGET_MAKE_ENV is indeed used in the configure step since it's part of TARGET_CONFIGURE_OPTS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index e7eea2aa58..7bb08157f5 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -84,7 +84,7 @@ define $(2)_CONFIGURE_CMDS ) \ package/meson/cross-compilation.conf.in \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf - PATH=$$(BR_PATH) $$($$(PKG)_CONF_ENV) $$(MESON) \ + $$(TARGET_MAKE_ENV) $$($$(PKG)_CONF_ENV) $$(MESON) \ --prefix=/usr \ --libdir=lib \ --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \