From: Ali Alnubani <alialnu@mellanox.com>
To: "dev@dpdk.org" <dev@dpdk.org>
Cc: "bruce.richardson@intel.com" <bruce.richardson@intel.com>,
Thomas Monjalon <thomas@monjalon.net>,
"ferruh.yigit@intel.com" <ferruh.yigit@intel.com>
Subject: [dpdk-dev] [PATCH v2] build: use cat if found
Date: Mon, 1 Apr 2019 15:38:59 +0000 [thread overview]
Message-ID: <20190401153836.30807-1-alialnu@mellanox.com> (raw)
Message-ID: <20190401153859.AF8ci7Ygt34nbHgnD-V8peew8Ixrs8AvQFh7EQbJbgQ@z> (raw)
In-Reply-To: <20190401103551.28909-1-alialnu@mellanox.com>
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(-)
diff --git a/meson.build b/meson.build
index fa6bf3d07..6061c4b1e 100644
--- a/meson.build
+++ b/meson.build
@@ -3,8 +3,9 @@
project('DPDK', 'C',
# Get version number from file.
- # Use "more" rather than "cat" for windows compatibility.
- version: run_command('more', files('VERSION')).stdout().strip(),
+ # Fallback to "more" for Windows compatibility.
+ version: run_command(find_program('cat', 'more'),
+ files('VERSION')).stdout().strip(),
license: 'BSD',
default_options: ['buildtype=release', 'default_library=static'],
meson_version: '>= 0.47.1'
--
2.19.2
next prev parent reply other threads:[~2019-04-01 15:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 10:36 [dpdk-dev] [PATCH] build: use cat instead of more Ali Alnubani
2019-04-01 10:36 ` Ali Alnubani
2019-04-01 11:24 ` Thomas Monjalon
2019-04-01 11:24 ` Thomas Monjalon
2019-04-01 14:47 ` Bruce Richardson
2019-04-01 14:47 ` Bruce Richardson
2019-04-01 15:38 ` Ali Alnubani [this message]
2019-04-01 15:38 ` [dpdk-dev] [PATCH v2] build: use cat if found Ali Alnubani
2019-04-01 15:48 ` Bruce Richardson
2019-04-01 15:48 ` Bruce Richardson
2019-04-01 16:59 ` Thomas Monjalon
2019-04-01 16:59 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190401153836.30807-1-alialnu@mellanox.com \
--to=alialnu@mellanox.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).