[dpdk-stable] [PATCH 1/1] devtools: fix build test config inheritance from env

Ferruh Yigit ferruh.yigit at intel.com
Tue Nov 10 18:18:52 CET 2020


On 11/9/2020 9:00 PM, Thomas Monjalon wrote:
> PKG_CONFIG_PATH is specific to each target, so it must be empty
> before configuring each build from the file according to DPDK_TARGET.
> Inheriting a default PKG_CONFIG_PATH for all targets does not make sense
> and is prone to confusion.
> 
> DPDK_MESON_OPTIONS might take a global initial value from environment
> to customize a build test from the shell. Example:
> 	DPDK_MESON_OPTIONS="b_lto=true"
> Some target-specific options can be added in the configuration file:
> 	DPDK_MESON_OPTIONS="$DPDK_MESON_OPTIONS kernel_dir=$MYKERNEL"
> 
> Fixes: 272236741258 ("devtools: load target-specific compilation environment")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
> ---
>   devtools/test-meson-builds.sh | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
> index 0c95d1cc98..6d265f6ab3 100755
> --- a/devtools/test-meson-builds.sh
> +++ b/devtools/test-meson-builds.sh
> @@ -38,10 +38,10 @@ else
>   fi
>   
>   default_path=$PATH
> -default_pkgpath=$PKG_CONFIG_PATH
>   default_cppflags=$CPPFLAGS
>   default_cflags=$CFLAGS
>   default_ldflags=$LDFLAGS
> +default_meson_options=$DPDK_MESON_OPTIONS
>   
>   check_cc_flags () # <flag to check> <flag2> ...
>   {
> @@ -53,11 +53,11 @@ load_env () # <target compiler>
>   {
>   	targetcc=$1
>   	export PATH=$default_path
> -	export PKG_CONFIG_PATH=$default_pkgpath
> +	export PKG_CONFIG_PATH= # global default makes no sense
>   	export CPPFLAGS=$default_cppflags
>   	export CFLAGS=$default_cflags
>   	export LDFLAGS=$default_ldflags
> -	unset DPDK_MESON_OPTIONS
> +	export DPDK_MESON_OPTIONS=$default_meson_options
>   	if [ -n "$target_override" ] ; then
>   		DPDK_TARGET=$target_override
>   	elif command -v $targetcc >/dev/null 2>&1 ; then
> 

In same run both 64bit and 32bit builds are done,

At least for my environment,
for 64bit, PKG_CONFIG_PATH should be '/usr/local/lib64/pkgconfig/'
for 32bit, PKG_CONFIG_PATH should be '/usr/lib/pkgconfig/'

What should I set in the config file to support both?


More information about the stable mailing list