debian/patches/0004-build-bump-minimum-Meson-version-to-0.47.1.patch

   1 Author: Luca Boccassi <bluca@debian.org>
   2 Description: bump minimum Meson version to 0.47.1
   3  Meson 0.47.1 fixed a bug that is difficult to work around, which causes
   4  the linker flag of dependencies to be repeated dozens of times, which
   5  causes issues especially when using the built-in dependency() API.
   6  Bump the minimum version and remove obsolete version checks.
   7 Origin: https://patches.dpdk.org/patch/49995/
   8 --- a/drivers/meson.build
   9 +++ b/drivers/meson.build
  10 @@ -148,8 +148,5 @@ foreach class:driver_classes
  11                 endif # build
  12         endforeach
  13
  14 -       if meson.version().version_compare('>=0.47')
  15 -               # prior to 0.47, set_variable can't take array params
  16 -               set_variable(class + '_drivers', class_drivers)
  17 -       endif
  18 +       set_variable(class + '_drivers', class_drivers)
  19  endforeach
  20 --- a/kernel/linux/meson.build
  21 +++ b/kernel/linux/meson.build
  22 @@ -27,11 +27,7 @@ else
  23         make_returncode = run_command('make', '-sC', kernel_dir,
  24                         'kernelversion').returncode()
  25         if make_returncode != 0
  26 -               if meson.version().version_compare('>=0.44')
  27 -                       warning(WARN_NO_HEADERS)
  28 -               else
  29 -                       message('WARNING: ' + WARN_NO_HEADERS)
  30 -               endif
  31 +               warning(WARN_NO_HEADERS)
  32         else # returncode == 0
  33
  34  # DO ACTUAL MODULE BUILDING
  35 --- a/meson.build
  36 +++ b/meson.build
  37 @@ -5,7 +5,7 @@ project('DPDK', 'C',
  38         version: '18.11.0',
  39         license: 'BSD',
  40         default_options: ['buildtype=release', 'default_library=static'],
  41 -       meson_version: '>= 0.41'
  42 +       meson_version: '>= 0.47.1'
  43  )
  44
  45  # set up some global vars for compiler, platform, configuration, etc.
  46 @@ -105,23 +105,18 @@ foreach lib:enabled_libs
  47  endforeach
  48  message(output_message + '\n')
  49
  50 -
  51 -# prior to 0.47 set_variable didn't work with arrays, so we can't
  52 -# track driver lists easily
  53 -if meson.version().version_compare('>=0.47')
  54 -       output_message = '\n===============\nDrivers Enabled\n===============\n'
  55 -       foreach class:driver_classes
  56 -               class_drivers = get_variable(class + '_drivers')
  57 -               output_message += '\n' + class + ':\n\t'
  58 -               output_count = 0
  59 -               foreach drv:class_drivers
  60 -                       output_message += drv + ', '
  61 -                       output_count += 1
  62 -                       if output_count == 8
  63 -                               output_message += '\n\t'
  64 -                               output_count = 0
  65 -                       endif
  66 -               endforeach
  67 +output_message = '\n===============\nDrivers Enabled\n===============\n'
  68 +foreach class:driver_classes
  69 +       class_drivers = get_variable(class + '_drivers')
  70 +       output_message += '\n' + class + ':\n\t'
  71 +       output_count = 0
  72 +       foreach drv:class_drivers
  73 +               output_message += drv + ', '
  74 +               output_count += 1
  75 +               if output_count == 8
  76 +                       output_message += '\n\t'
  77 +                       output_count = 0
  78 +               endif
  79         endforeach
  80 -       message(output_message + '\n')
  81 -endif
  82 +endforeach
  83 +message(output_message + '\n')