From: Jerin Jacob <jer...@marvell.com>
Remove the following meson build warnings
1) WARNING: Project specifies a minimum meson_version '>= 0.47.1'
but uses features which were added in newer versions:
* 0.48.0: {'console arg in custom_target'}
2) config/arm/meson.build:153: WARNING: Trying to compare values of
different types (list, str) using ==.
Signed-off-by: Jerin Jacob <jer...@marvell.com>
---
config/arm/meson.build | 4 ++--
meson.build | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 8e892fa77..170a4981a 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -116,8 +116,8 @@ else
cmd_output = cmd.stdout().to_lower().strip().split(' ')
endif
# Set to generic if variable is not found
- machine = get_variable('impl_' + cmd_output[0], 'generic')
- if machine == 'generic'
+ machine = get_variable('impl_' + cmd_output[0], ['generic'])
+ if machine[0] == 'generic'
machine = impl_generic
cmd_output = cmd_generic
endif
diff --git a/meson.build b/meson.build
index 69833de82..f1abf1e59 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project('DPDK', 'C',
version: '19.05.0-rc0',
license: 'BSD',
default_options: ['buildtype=release', 'default_library=static'],
- meson_version: '>= 0.47.1'
+ meson_version: '>= 0.48.0'
)
# set up some global vars for compiler, platform, configuration, etc.
--
2.20.1
