From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id 3C8B11D65A; Fri, 15 Jun 2018 11:26:20 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8C27515AB; Fri, 15 Jun 2018 02:26:19 -0700 (PDT) Received: from net-debian.shanghai.arm.com (net-debian.shanghai.arm.com [10.169.36.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id CFEF13F318; Fri, 15 Jun 2018 02:26:18 -0700 (PDT) From: Gavin Hu To: dev@dpdk.org Cc: nd@arm.com, gavin.hu@arm.com, stable@dpdk.org Date: Fri, 15 Jun 2018 17:26:03 +0800 Message-Id: <20180615092605.12043-5-gavin.hu@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180615092605.12043-1-gavin.hu@arm.com> References: <20180615080120.29253-1-gavin.hu@arm.com> <20180615092605.12043-1-gavin.hu@arm.com> Subject: [dpdk-stable] [PATCH v9 4/6] devtools: fix the missing ninja command error X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2018 09:26:20 -0000 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 Reviewed-by: Phil Yang Reviewed-by: Song Zhu --- 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 () # { builddir=$1 @@ -20,8 +29,8 @@ build () # $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