devtools: fix building kernel component tags

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

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 630a1a6..9fe0a04 100755 (executable)
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -15,6 +15,11 @@ srcdir=$(dirname $(readlink -f $0))/..
 MESON=${MESON:-meson}
 use_shared="--default-library=shared"
 
+if command -v gmake >/dev/null 2>&1 ; then
+       MAKE=gmake
+else
+       MAKE=make
+fi
 if command -v ninja >/dev/null 2>&1 ; then
        ninja_cmd=ninja
 elif command -v ninja-build >/dev/null 2>&1 ; then
@@ -28,23 +33,25 @@ build () # <directory> <meson options>
 {
        builddir=$1
        shift
-       if [ ! -f "$builddir/build.ninja" ] ; then
-               options="--werror -Dexamples=all $*"
-               echo "$MESON $options $srcdir $builddir"
-               $MESON $options $srcdir $builddir
-               unset CC
-       fi
-       if [ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] ; then
-               # for full output from ninja use "-v"
-               echo "$ninja_cmd -v -C $builddir"
-               $ninja_cmd -v -C $builddir
-       elif [ -n "$TEST_MESON_BUILD_VERBOSE" ] ; then
-               # for keeping the history of short cmds, pipe through cat
-               echo "$ninja_cmd -C $builddir | cat"
-               $ninja_cmd -C $builddir | cat
-       else
-               echo "$ninja_cmd -C $builddir"
-               $ninja_cmd -C $builddir
+       if command -v $CC >/dev/null 2>&1 ; then
+               if [ ! -f "$builddir/build.ninja" ] ; then
+                       options="--werror -Dexamples=all $*"
+                       echo "$MESON $options $srcdir $builddir"
+                       $MESON $options $srcdir $builddir
+                       unset CC
+               fi
+               if [ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] ; then
+                       # for full output from ninja use "-v"
+                       echo "$ninja_cmd -v -C $builddir"
+                       $ninja_cmd -v -C $builddir
+               elif [ -n "$TEST_MESON_BUILD_VERBOSE" ] ; then
+                       # for keeping the history of short cmds, pipe through cat
+                       echo "$ninja_cmd -C $builddir | cat"
+                       $ninja_cmd -C $builddir | cat
+               else
+                       echo "$ninja_cmd -C $builddir"
+                       $ninja_cmd -C $builddir
+               fi
        fi
 }
 
@@ -69,18 +76,20 @@ for c in gcc clang ; do
 done
 
 # test compilation with minimal x86 instruction set
+# Set the install path for libraries to "lib" explicitly to prevent problems
+# with pkg-config prefixes if installed in "lib/x86_64-linux-gnu" later.
 default_machine='nehalem'
 ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false)
 if [ "$ok" = "false" ] ; then
        default_machine='corei7'
 fi
-build build-x86-default -Dmachine=$default_machine $use_shared
+build build-x86-default -Dlibdir=lib -Dmachine=$default_machine $use_shared
 
 # enable cross compilation if gcc cross-compiler is found
 c=aarch64-linux-gnu-gcc
 if command -v $c >/dev/null 2>&1 ; then
        # compile the general v8a also for clang to increase coverage
-       export CC="ccache clang"
+       export CC="clang"
        build build-arm64-host-clang $use_shared \
                --cross-file $srcdir/config/arm/arm64_armv8_linux_gcc
 
@@ -90,3 +99,17 @@ if command -v $c >/dev/null 2>&1 ; then
                        $use_shared --cross-file $f
        done
 fi
+
+# 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
+$ninja_cmd -C $build_path install
+
+pc_file=$(find $DESTDIR -name libdpdk.pc)
+export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH
+
+for example in cmdline helloworld l2fwd l3fwd skeleton timer; do
+       echo "## Building $example"
+       $MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean all
+done