devtools: fix ninja command in build test
authorGavin Hu <gavin.hu@arm.com>
Fri, 29 Jun 2018 17:27:36 +0000 (01:27 +0800)
committerThomas Monjalon <thomas@monjalon.net>
Wed, 11 Jul 2018 19:14:21 +0000 (21:14 +0200)
On some linux distributions, eg: CentOS, the ninja executable has a
different name: ninja-build, this patch is to check and adapt to it
accordingly.

./devtools/test-meson-builds.sh: line 24: ninja: command not found

Fixes: a55277a788 ("devtools: add test script for meson builds")
Cc: stable@dpdk.org
Signed-off-by: Gavin Hu <gavin.hu@arm.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Reviewed-by: Song Zhu <song.zhu@arm.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
devtools/test-meson-builds.sh

index f2ad05f..662f82d 100755 (executable)
 srcdir=$(dirname $(readlink -m $0))/..
 MESON=${MESON:-meson}
 
+if command -v ninja >/dev/null 2>&1 ; then
+       ninja_cmd=ninja
+elif command -v ninja-build >/dev/null 2>&1 ; then
+       ninja_cmd=ninja-build
+else
+       echo "ERROR: ninja is not found" >&2
+       exit 1
+fi
+
 build () # <directory> <meson options>
 {
        builddir=$1
@@ -20,8 +29,8 @@ build () # <directory> <meson options>
                $MESON $options $srcdir $builddir
                unset CC
        fi
-       echo "ninja -C $builddir"
-       ninja -C $builddir
+       echo "$ninja_cmd -C $builddir"
+       $ninja_cmd -C $builddir
 }
 
 # shared and static linked builds with gcc and clang