Skip to contentSkip to conversation

devtools: fix x86-default env when installing

PATCH In review David Marchand 2 participants 2 messages Nov 12, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 devtools: fix x86-default env when installing

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")
---
 devtools/test-meson-builds.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
devtools/test-meson-builds.sh +1 -3
index 469251b6ef..7b0d05ac3f 100755
@@ -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"
Signature · 1 line
2.23.0
#1 lore raw

12/11/2020 14:38, David Marchand:

Quoted 4 lines

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.

Reworded first sentence to make it less personal ;)
"The x86-default environment was loaded after installing this target." and applied, thanks.