[dpdk-stable] [PATCH v6 5/7] devtools: fix the missing ninja command error on CentOS
Gavin Hu
gavin.hu at arm.com
Thu Jun 14 11:51:25 CEST 2018
On CentOS, the ninja executable has a different name:
ninja-build, this patch is to fix the missing command error
on CentOS as follows:
./devtools/test-meson-builds.sh: line 24: ninja: command not found
Fixes: a55277a788 ("devtools: add test script for meson builds")
Cc: stable at dpdk.org
Signed-off-by: Gavin Hu <gavin.hu at arm.com>
Reviewed-by: Phil Yang <phil.yang at arm.com>
Reviewed-by: Song Zhu <song.zhu at arm.com>
---
devtools/test-meson-builds.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 6bce3df7f..4afac76dd 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -21,7 +21,11 @@ build () # <directory> <meson options>
$MESON $options $srcdir $builddir
fi
echo "ninja -C $builddir"
- ninja -C $builddir
+ if [ "$(lsb_release -d | grep -c 'CentOS')" != "0" ] ; then
+ ninja-build -C $builddir
+ else
+ ninja -C $builddir
+ fi
}
# shared and static linked builds with gcc and clang
--
2.11.0
More information about the stable
mailing list