d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: bump minimum Meson version to 0.47.1

Browse Source 
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>
This commit is contained in:
Luca Boccassi 2019-02-26 17:46:32 +00:00 committed by Thomas Monjalon
parent 921c7e926f
commit eded3f928c
3 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/meson.build
View File

@ -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
endforeach

4
kernel/linux/meson.build
View File

@ -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
else # returncode == 0
# DO ACTUAL MODULE BUILDING

15
meson.build
View File

@ -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,12 +104,8 @@ 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
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
@ -121,6 +117,5 @@ if meson.version().version_compare('>=0.47')
output_count = 0
endif
endforeach
endforeach
message(output_message + '\n')
endif
endforeach
message(output_message + '\n')