From 936f6422d6812938de88b5084140b34e0b6bb314 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 12 Nov 2020 14:38:43 +0100 Subject: [PATCH] devtools: fix x86-default build test install env [ upstream commit 252e92eec4f3ba97884bf9424a607a07729c7c33 ] The x86-default environment was loaded 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") 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 0971fe59c4..8678a3d824 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -135,14 +135,12 @@ 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-root $ninja_cmd -C $build_path install - -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"