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 D9A46A09D3 for ; Thu, 12 Nov 2020 14:38:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A8E9B569B; Thu, 12 Nov 2020 14:38:57 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 83BFB569B for ; Thu, 12 Nov 2020 14:38:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605188334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=idoCNPHV+8HR8+JyU1KiAIGhmJq3144Y8VA9UYmmzZw=; b=gBxWRhuGSrGHlNzvx+z/avWh7L20AQyg3ypaXZYKBl45NMLpvHnYnSOSsqkgqeZCnntYvk ekZc+aqKIqq7UcncaYfSS5TdJ5xa9u1FaUrCdi82sQu1r1fvOasBSIOujJm/SbaOJrzFKf LS6ZW0z1n826R9MIvlXoqiz1DVdFVfA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-114-G3FHuhA-M3yIbztwpqiCdA-1; Thu, 12 Nov 2020 08:38:52 -0500 X-MC-Unique: G3FHuhA-M3yIbztwpqiCdA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57836CE64A; Thu, 12 Nov 2020 13:38:51 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.193.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id 995A060C13; Thu, 12 Nov 2020 13:38:49 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, stable@dpdk.org Date: Thu, 12 Nov 2020 14:38:43 +0100 Message-Id: <20201112133843.23970-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] [PATCH] devtools: fix x86-default env when installing 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" While testing Thomas patch on this script verbosity, I noticed that we load the x86-default environment after installing this target. I did not see any problem with it, yet we should load corresponding environment before installing a target. Fixes: bd253daa7717 ("devtools: fix test of ninja install") Cc: stable@dpdk.org Signed-off-by: David Marchand --- devtools/test-meson-builds.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 469251b6ef..7b0d05ac3f 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -253,17 +253,15 @@ done # Test installation of the x86-default target, to be used for checking # the sample apps build using the pkg-config file for cflags and libs +load_env cc build_path=$(readlink -f $builds_dir/build-x86-default) export DESTDIR=$build_path/install # No need to reinstall if ABI checks are enabled if [ -z "$DPDK_ABI_REF_VERSION" ]; then install_target $build_path $DESTDIR fi - -load_env cc pc_file=$(find $DESTDIR -name libdpdk.pc) export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH - # if pkg-config defines the necessary flags, test building some examples if pkg-config --define-prefix libdpdk >/dev/null 2>&1; then export PKGCONF="pkg-config --define-prefix" -- 2.23.0