devtools: split meson build helper

[dpdk.git] / devtools / test-meson-builds.sh

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index e3a5a5d..fb6c404 100755 (executable)
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -12,8 +12,11 @@ PIPEFAIL=""
 set -o | grep -q pipefail && set -o pipefail && PIPEFAIL=1
 
 srcdir=$(dirname $(readlink -f $0))/..
+. $srcdir/devtools/load-devel-config
+
 MESON=${MESON:-meson}
 use_shared="--default-library=shared"
+builds_dir=${DPDK_BUILD_TEST_DIR:-.}
 
 if command -v gmake >/dev/null 2>&1 ; then
        MAKE=gmake
@@ -36,37 +39,45 @@ fi
 
 default_path=$PATH
 default_pkgpath=$PKG_CONFIG_PATH
+default_cppflags=$CPPFLAGS
+default_cflags=$CFLAGS
+default_ldflags=$LDFLAGS
 
 load_env () # <target compiler>
 {
        targetcc=$1
        export PATH=$default_path
        export PKG_CONFIG_PATH=$default_pkgpath
+       export CPPFLAGS=$default_cppflags
+       export CFLAGS=$default_cflags
+       export LDFLAGS=$default_ldflags
        unset DPDK_MESON_OPTIONS
        command -v $targetcc >/dev/null 2>&1 || return 1
        DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p')
        . $srcdir/devtools/load-devel-config
 }
 
-build () # <directory> <target compiler> <meson options>
+config () # <dir> <builddir> <meson options>
 {
-       builddir=$1
+       dir=$1
        shift
-       targetcc=$1
+       builddir=$1
        shift
-       # skip build if compiler not available
-       command -v ${CC##* } >/dev/null 2>&1 || return 0
-       load_env $targetcc || return 0
-       if [ ! -f "$builddir/build.ninja" ] ; then
-               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
+       if [ -f "$builddir/build.ninja" ] ; then
+               return
        fi
+       options="--werror -Dexamples=all"
+       for option in $DPDK_MESON_OPTIONS ; do
+               options="$options -D$option"
+       done
+       options="$options $*"
+       echo "$MESON $options $dir $builddir"
+       $MESON $options $dir $builddir
+}
+
+compile () # <builddir>
+{
+       builddir=$1
        if [ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] ; then
                # for full output from ninja use "-v"
                echo "$ninja_cmd -v -C $builddir"
@@ -81,6 +92,19 @@ build () # <directory> <target compiler> <meson options>
        fi
 }
 
+build () # <directory> <target compiler> <meson options>
+{
+       targetdir=$1
+       shift
+       targetcc=$1
+       shift
+       # skip build if compiler not available
+       command -v ${CC##* } >/dev/null 2>&1 || return 0
+       load_env $targetcc || return 0
+       config $srcdir $builds_dir/$targetdir $*
+       compile $builds_dir/$targetdir
+}
+
 if [ "$1" = "-vv" ] ; then
        TEST_MESON_BUILD_VERY_VERBOSE=1
 elif [ "$1" = "-v" ] ; then
@@ -98,6 +122,7 @@ for c in gcc clang ; do
        for s in static shared ; do
                export CC="$CCACHE $c"
                build build-$c-$s $c --default-library=$s
+               unset CC
        done
 done
 
@@ -116,17 +141,19 @@ c=aarch64-linux-gnu-gcc
 export CC="clang"
 build build-arm64-host-clang $c $use_shared \
        --cross-file $srcdir/config/arm/arm64_armv8_linux_gcc
+unset CC
 # all gcc/arm configurations
-for f in $srcdir/config/arm/arm*gcc ; do
+for f in $srcdir/config/arm/arm64_[bdo]*gcc ; do
        export CC="$CCACHE gcc"
        build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) $c \
                $use_shared --cross-file $f
+       unset CC
 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
-build_path=build-x86-default
-export DESTDIR=$(pwd)/$build_path/install-root
+build_path=$(readlink -f $builds_dir/build-x86-default)
+export DESTDIR=$build_path/install-root
 $ninja_cmd -C $build_path install
 
 load_env cc