Skip to content

Commit

Permalink
devtools: fix x86-default build test install env
Browse files Browse the repository at this point in the history
[ upstream commit 252e92e ]

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: bd253da ("devtools: fix test of ninja install")

Signed-off-by: David Marchand <david.marchand@redhat.com>
  • Loading branch information
david-marchand authored and bluca committed Nov 16, 2020
1 parent 4c3e705 commit 936f642
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions devtools/test-meson-builds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 936f642

Please sign in to comment.