From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <christian.ehrhardt@canonical.com>
Received: from youngberry.canonical.com (youngberry.canonical.com
 [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id C49415B38
 for <stable@dpdk.org>; Mon, 30 Jul 2018 18:17:30 +0200 (CEST)
Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=lap.fritz.box)
 by youngberry.canonical.com with esmtpsa
 (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76)
 (envelope-from <christian.ehrhardt@canonical.com>)
 id 1fkArC-00009D-5i; Mon, 30 Jul 2018 16:17:14 +0000
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: Gavin Hu <gavin.hu@arm.com>
Cc: Phil Yang <phil.yang@arm.com>, Song Zhu <song.zhu@arm.com>,
 Bruce Richardson <bruce.richardson@intel.com>,
 dpdk stable <stable@dpdk.org>
Date: Mon, 30 Jul 2018 18:12:16 +0200
Message-Id: <20180730161342.16566-91-christian.ehrhardt@canonical.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20180730161342.16566-1-christian.ehrhardt@canonical.com>
References: <20180730161342.16566-1-christian.ehrhardt@canonical.com>
Subject: [dpdk-stable] patch 'devtools: fix ninja command in build test' has
	been queued to stable release 18.05.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
 <mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
 <mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jul 2018 16:17:30 -0000

Hi,

FYI, your patch has been queued to stable release 18.05.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/01/18. So please
shout if anyone has objections.

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
>>From 589b2d46c5a45f28300e5b1bb1eb1e66a05457db Mon Sep 17 00:00:00 2001
From: Gavin Hu <gavin.hu@arm.com>
Date: Sat, 30 Jun 2018 01:27:36 +0800
Subject: [PATCH] devtools: fix ninja command in build test

[ upstream commit c0d022070f7c7a77c1a47fee55f971b2afb763d4 ]

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")

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 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 9868c325b..20d8c1a26 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 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
-- 
2.17.1