Skip to content

Commit

Permalink
devtools: load target-specific compilation environment
Browse files Browse the repository at this point in the history
In order to re-use the same test environment as with
test-build.sh, the configuration file is loaded at each build,
after adjusting the variable DPDK_TARGET.

This is especially useful to set the variable PKG_CONFIG_PATH,
or define some meson options (without -D) in DPDK_MESON_OPTIONS.

The DPDK_TARGET values can be
	aarch64-*, powerpc64-*, x86_64-*.
The matching DPDK_TARGET values for test-build.sh are
	arm64-*, ppc_64-*, x86_64-*.
The advised expressions to use in the common configuration file are:
	if echo $DPDK_TARGET | grep -q '^a.*64-' ; then
	elif echo $DPDK_TARGET | grep -q '^p.*pc.*64' ; then
	elif echo $DPDK_TARGET | grep -q '^x86_64' ; then
	fi

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Luca Boccassi <bluca@debian.org>
  • Loading branch information
tmonjalo committed Sep 12, 2019
1 parent e0ae780 commit 2722367
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion devtools/test-meson-builds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ else
exit 1
fi

default_path=$PATH
default_pkgpath=$PKG_CONFIG_PATH

reset_env ()
{
export PATH=$default_path
export PKG_CONFIG_PATH=$default_pkgpath
unset DPDK_MESON_OPTIONS
}

build () # <directory> <target compiler> <meson options>
{
builddir=$1
Expand All @@ -38,8 +48,15 @@ build () # <directory> <target compiler> <meson options>
# skip build if compiler not available
command -v $CC >/dev/null 2>&1 || return 0
command -v $targetcc >/dev/null 2>&1 || return 0
reset_env
DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p')
. $srcdir/devtools/load-devel-config
if [ ! -f "$builddir/build.ninja" ] ; then
options="--werror -Dexamples=all $*"
options="--werror -Dexamples=all"
for option in $DPDK_MESON_OPTIONS ; do
options="$options -D$option"
done
options="$options $*"
echo "$MESON $options $srcdir $builddir"
$MESON $options $srcdir $builddir
unset CC
Expand Down

0 comments on commit 2722367

Please sign in to comment.