From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 83C7FA052A for ; Mon, 9 Nov 2020 22:00:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5373472E2; Mon, 9 Nov 2020 22:00:42 +0100 (CET) Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by dpdk.org (Postfix) with ESMTP id 7FE7D697B; Mon, 9 Nov 2020 22:00:37 +0100 (CET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id ECD5ADD8; Mon, 9 Nov 2020 16:00:33 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 09 Nov 2020 16:00:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=AIkkEBil40VDOIZ32Ajg2ueJKw +pM139SczxGYddzpY=; b=H2hZ1o/N3WqBaUMHInnTODK+i2xXGC9Qz4awhSjjOP U3T3HwB0H+hfRkJFJSXf1xISlVsTBEQwhLJiyzWbpDH0E4aDn5tYtts92TcHT0KX 1UIYk9hUM73NML3InB/lguOQQn0epX/bSd9X4kbtsvvpDdHMglEAkKeaVCUqzPnd OHxclOAP5iQRFppZaHnirzpWkuB8xswGYz619INLq5vSPN5DeqgIM+PsEu/eA1gz n5spcKs7Dc4RIwJL2/imcgOAKYjpJCoQiv/xc8TO2LVBNsk89/3xRZLTRmcevf99 lW5vz0bFh2xZkWfub9IEMtU/DwUbcD0g8Cn7UWHfSzWg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=AIkkEBil40VDOIZ32 Ajg2ueJKw+pM139SczxGYddzpY=; b=aHPEclFe01QVTXMxQu6uhzWM2kke9CjN5 dbdJinyCipSY8cQrTmE0wyDcrx91J6Ih8xBxLfhgWP5wPJh/r30K5Lx8dJrz68h0 PpHZEAMpBdKA8w6xytAWYdH97ib4tAskG347yKMJILClPyDRuLLob4eT5OWmNEeT rdmHnaAoWnZRDI+9FxgOsN7qtUxclsqnupH4FD8M8gLrlKEByEGNtyEXBfSdEUZn SfclbibpWo9rZ+7zleC8C7rUUSG4/h5yfDKPi+94qMVy5ZWBBooCAiDoimRHR4hX iS400Hf68aZ8EHxlf2Lul0GrWbZnusHFVk5bOXYfWMeIhq9gw5vNw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudduhedgudegiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf frrghtthgvrhhnpedvledvudehvdduudevuedvveehgeduleegiefgjeehudehtddtgedu ffejiefhgfenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhho nhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 9941A3063083; Mon, 9 Nov 2020 16:00:31 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Cc: ferruh.yigit@intel.com, david.marchand@redhat.com, bruce.richardson@intel.com, stable@dpdk.org, Luca Boccassi Date: Mon, 9 Nov 2020 22:00:08 +0100 Message-Id: <20201109210009.919129-1-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 1/1] devtools: fix build test config inheritance from env X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" PKG_CONFIG_PATH is specific to each target, so it must be empty before configuring each build from the file according to DPDK_TARGET. Inheriting a default PKG_CONFIG_PATH for all targets does not make sense and is prone to confusion. DPDK_MESON_OPTIONS might take a global initial value from environment to customize a build test from the shell. Example: DPDK_MESON_OPTIONS="b_lto=true" Some target-specific options can be added in the configuration file: DPDK_MESON_OPTIONS="$DPDK_MESON_OPTIONS kernel_dir=$MYKERNEL" Fixes: 272236741258 ("devtools: load target-specific compilation environment") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon --- devtools/test-meson-builds.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 0c95d1cc98..6d265f6ab3 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -38,10 +38,10 @@ else fi default_path=$PATH -default_pkgpath=$PKG_CONFIG_PATH default_cppflags=$CPPFLAGS default_cflags=$CFLAGS default_ldflags=$LDFLAGS +default_meson_options=$DPDK_MESON_OPTIONS check_cc_flags () # ... { @@ -53,11 +53,11 @@ load_env () # { targetcc=$1 export PATH=$default_path - export PKG_CONFIG_PATH=$default_pkgpath + export PKG_CONFIG_PATH= # global default makes no sense export CPPFLAGS=$default_cppflags export CFLAGS=$default_cflags export LDFLAGS=$default_ldflags - unset DPDK_MESON_OPTIONS + export DPDK_MESON_OPTIONS=$default_meson_options if [ -n "$target_override" ] ; then DPDK_TARGET=$target_override elif command -v $targetcc >/dev/null 2>&1 ; then -- 2.28.0