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 E5F17A04DB for ; Tue, 17 Nov 2020 12:14:29 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7827FF3E; Tue, 17 Nov 2020 12:14:28 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 99888F3E for ; Tue, 17 Nov 2020 12:14:25 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id p8so22773556wrx.5 for ; Tue, 17 Nov 2020 03:14:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0dyYiMuDZ5O47QJo0Do9tw+jnk4rrrIYDiRx7BscrEc=; b=T3KQDgYgXDFa17dOfqz2iIA4cTXGUNRb9Iz/hvvg3oYcbvqQsMpo+2G9sx+u28kVUO 6+xS9pyBg93/At1FN6oxs7YptVOfJFLDrI/ePcOFs/x/ENET/+bSZzuoIjSCb68YHCiI ydh6pLoqJCcO1LE9vRkRC/Tl6OvXzeCzSxwxQOR1HrjI856TK64XbzidJf2yzRmZenYW 9nFWguii4cPqQefyzBKXBYarTa7z05Lk1jKn2DoBH8cto1DNfqMlX6lTDiac6c9bVe5x zHQlRsBc73RpnSn4/z2guTLqDw9Q1ulXKyuPur8Tp5nxRyqmPsFGR/52pVU5qLH0qqSb 509g== 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=0dyYiMuDZ5O47QJo0Do9tw+jnk4rrrIYDiRx7BscrEc=; b=PiErleqSO6FGDToJ6cPWc2uYU0SlaDx8HW8E1okGFcsXJgL4gJG+pJ1uN+lmZgwJrK Zgvr6SQZg1oX/F3BCDCeqTJnMBpYWRiGsePJGV1QQdZr6PT8Hp1oew6aN99LfMJIoA8C mM2W/aD8/4Q3OP4PJq1G2qOUj9E9T0SuytzI1+epC8BDoiOy3DK7HsX2+zEcMbmbV+g1 U+kaR7mu1btqwGlM5kSiPPqDejnPYitZPsBErXg7RJSz0hEHX2OGCltYtCdrv9I5F87w q7T2rd/6zhurPI4F1xQWfrDNNDznN29pu66eDm2eG4ADhpThpIFKqtGadGxQz+fsmmqX 4yRg== X-Gm-Message-State: AOAM533ONrrPqjqelXjnaDyhWfhkVCE+kHbSfvTnZfVbrWulpGrsl6Kh m9q8MeSeJSI/SZrb1niusxQ= X-Google-Smtp-Source: ABdhPJyZ+PJlt4eoHcRZcUL67Uk1nZyH4H2CPN6IujrRZeI2dritSvOKg0XFyBMFfmZW663LTAmkcA== X-Received: by 2002:adf:d083:: with SMTP id y3mr2401596wrh.261.1605611664212; Tue, 17 Nov 2020 03:14:24 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q2sm26300517wru.76.2020.11.17.03.14.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:14:23 -0800 (PST) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: Bruce Richardson , Ferruh Yigit , Jerin Jacob , David Marchand , dpdk stable Date: Tue, 17 Nov 2020 11:13:35 +0000 Message-Id: <20201117111416.1961049-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109185030.3478760-2-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'devtools: fix build test config inheritance from env' has been queued to stable release 19.11.6 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" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/4c3e7055205a0c7dd873b82e2dfa7b33555f69d0 Thanks. Luca Boccassi --- >From 4c3e7055205a0c7dd873b82e2dfa7b33555f69d0 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 9 Nov 2020 22:00:08 +0100 Subject: [PATCH] devtools: fix build test config inheritance from env [ upstream commit a655cbd5bebd23804446c6e4a8f6815e74a5f2f7 ] The variables DPDK_MESON_OPTIONS, PATH, PKG_CONFIG_PATH, CPPFLAGS, CFLAGS and LDFLAGS can be customized in the config file loaded by devtools/load-devel-config at each build. The configuration can be adjusted per target thanks to the value set in the DPDK_TARGET variable. 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") Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson Acked-by: Ferruh Yigit Tested-by: Jerin Jacob Acked-by: David Marchand --- devtools/test-meson-builds.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index a76811e79f..0971fe59c4 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -38,20 +38,21 @@ 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 load_env () # { targetcc=$1 + # reset variables before target-specific config export PATH=$default_path - export PKG_CONFIG_PATH=$default_pkgpath + unset 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 command -v $targetcc >/dev/null 2>&1 || return 1 DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p') . $srcdir/devtools/load-devel-config -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.024420700 +0000 +++ 0001-devtools-fix-build-test-config-inheritance-from-env.patch 2020-11-17 11:13:12.857115320 +0000 @@ -1 +1 @@ -From a655cbd5bebd23804446c6e4a8f6815e74a5f2f7 Mon Sep 17 00:00:00 2001 +From 4c3e7055205a0c7dd873b82e2dfa7b33555f69d0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a655cbd5bebd23804446c6e4a8f6815e74a5f2f7 ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -32,2 +33,2 @@ - devtools/test-meson-builds.sh | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + devtools/test-meson-builds.sh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) @@ -36 +37 @@ -index 0c95d1cc98..f32b5784f4 100755 +index a76811e79f..0971fe59c4 100755 @@ -39 +40 @@ -@@ -38,10 +38,10 @@ else +@@ -38,20 +38,21 @@ else @@ -49,3 +49,0 @@ - check_cc_flags () # ... - { -@@ -52,12 +52,14 @@ check_cc_flags () # ... @@ -64,4 +62,3 @@ -+ # set target hint for use in the loaded config file - if [ -n "$target_override" ] ; then - DPDK_TARGET=$target_override - elif command -v $targetcc >/dev/null 2>&1 ; then + command -v $targetcc >/dev/null 2>&1 || return 1 + DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p') + . $srcdir/devtools/load-devel-config