summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2019-02-26 17:46:32 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-02-27 12:12:27 +0100
commiteded3f928c74a46a336264ad9b6cc46c522a1a75 (patch)
treebef2b9c8b7ab3763e03983f19abd296affe78d6d
parent921c7e926fcdf127bcac16fca6ca09e76d509c97 (diff)
downloaddpdk-eded3f928c74a46a336264ad9b6cc46c522a1a75.zip
dpdk-eded3f928c74a46a336264ad9b6cc46c522a1a75.tar.gz
dpdk-eded3f928c74a46a336264ad9b6cc46c522a1a75.tar.xz
build: bump minimum Meson version to 0.47.1
Meson 0.47.1 fixed a bug that is difficult to work around, which causes the linker flag of dependencies to be repeated dozens of times, which causes issues especially when using the built-in dependency() API. Bump the minimum version and remove obsolete version checks. Signed-off-by: Luca Boccassi <bluca@debian.org> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
-rw-r--r--drivers/meson.build5
-rw-r--r--kernel/linux/meson.build6
-rw-r--r--meson.build35
3 files changed, 17 insertions, 29 deletions
diff --git a/drivers/meson.build b/drivers/meson.build
index c3c66bb..e37d4fe 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -148,8 +148,5 @@ foreach class:driver_classes
endif # build
endforeach
- if meson.version().version_compare('>=0.47')
- # prior to 0.47, set_variable can't take array params
- set_variable(class + '_drivers', class_drivers)
- endif
+ set_variable(class + '_drivers', class_drivers)
endforeach
diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index 5b7ec06..d751d93 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -27,11 +27,7 @@ else
make_returncode = run_command('make', '-sC', kernel_dir,
'kernelversion').returncode()
if make_returncode != 0
- if meson.version().version_compare('>=0.44')
- warning(WARN_NO_HEADERS)
- else
- message('WARNING: ' + WARN_NO_HEADERS)
- endif
+ warning(WARN_NO_HEADERS)
else # returncode == 0
# DO ACTUAL MODULE BUILDING
diff --git a/meson.build b/meson.build
index 2bbd42b..69833de 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.41'
+ meson_version: '>= 0.47.1'
)
# set up some global vars for compiler, platform, configuration, etc.
@@ -104,23 +104,18 @@ foreach lib:enabled_libs
endforeach
message(output_message + '\n')
-
-# prior to 0.47 set_variable didn't work with arrays, so we can't
-# track driver lists easily
-if meson.version().version_compare('>=0.47')
- output_message = '\n===============\nDrivers Enabled\n===============\n'
- foreach class:driver_classes
- class_drivers = get_variable(class + '_drivers')
- output_message += '\n' + class + ':\n\t'
- output_count = 0
- foreach drv:class_drivers
- output_message += drv + ', '
- output_count += 1
- if output_count == 8
- output_message += '\n\t'
- output_count = 0
- endif
- endforeach
+output_message = '\n===============\nDrivers Enabled\n===============\n'
+foreach class:driver_classes
+ class_drivers = get_variable(class + '_drivers')
+ output_message += '\n' + class + ':\n\t'
+ output_count = 0
+ foreach drv:class_drivers
+ output_message += drv + ', '
+ output_count += 1
+ if output_count == 8
+ output_message += '\n\t'
+ output_count = 0
+ endif
endforeach
- message(output_message + '\n')
-endif
+endforeach
+message(output_message + '\n')