From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Monjalon <thomas@monjalon.net>
Subject: Re: [PATCH v2] build: use cat if found
Date: Mon, 01 Apr 2019 18:59:11 +0200
Message-ID: <1686605.rchtxGbhtY@xps>
References: <20190401103551.28909-1-alialnu@mellanox.com>
 <20190401153836.30807-1-alialnu@mellanox.com>
 <20190401154830.GA1452@bricha3-MOBL.ger.corp.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7Bit
Cc: dev@dpdk.org, "ferruh.yigit@intel.com" <ferruh.yigit@intel.com>
To: Bruce Richardson <bruce.richardson@intel.com>,
 Ali Alnubani <alialnu@mellanox.com>
Return-path: <dev-bounces@dpdk.org>
Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com
 [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 3D4D25323
 for <dev@dpdk.org>; Mon,  1 Apr 2019 18:59:16 +0200 (CEST)
In-Reply-To: <20190401154830.GA1452@bricha3-MOBL.ger.corp.intel.com>
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

01/04/2019 17:48, Bruce Richardson:
> On Mon, Apr 01, 2019 at 03:38:59PM +0000, Ali Alnubani wrote:
> > This is to fix a build error with meson in GNU/Linux that is caused
> > by using the 'more' command to read the VERSION file. The error:
> > 
> >     config/meson.build:10:10: ERROR:  String
> >     '::::::::::::::\n<RTE_SDK_PATH>VERSION\n::::::::::::::\n19' cannot be
> >     converted to int
> > 
> > The command 'more' prints the file name before the actual
> > contents of the file when it's being run without a controlling terminal.
> > This could happen in CI environments.
> > 
> > Please refer to:
> > https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/text-utils/more.c
> > 
> > Fixes: c04172b5f031 ("build: add single source of DPDK version number")
> > Fixes: d320fe56bd51 ("build: use version number from config file")
> > 
> > Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
> > Changes in v2:
> > 	- Use find_program to fallback to 'more'.
> > 	- Update patch title.
> > 
> >  meson.build | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> > 
> Thanks for the V2, code change looks good now. For the title, I think this
> is really a bug-fix so I'd suggest something like:
> 
> build: fix meson build in CI environments
> 
> as more helpful. [Thomas, can you correct on apply, or do you want a v3?]

Applied with title changed, thanks