[PATCH v12 4/6] devtools: fix the missing ninja command error
From: Gavin Hu <hidden>
Date: 2018-06-19 10:36:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted>
Reviewed-by: Phil Yang <redacted>
Reviewed-by: Song Zhu <redacted>
Acked-by: Bruce Richardson <redacted>
---
devtools/test-meson-builds.sh | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index f2ad05f32..9bb5b93bd 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh@@ -10,6 +10,15 @@ 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 missing, please install..." + 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
--
2.11.0