[10/30] meson: remove static_kwargs

After static_kwargs has been changed to an empty dictionary, it has
no functional effect and can be removed.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build     | 212 +++++++++++++++++++-----------------------------
 tcg/meson.build |   2 +-
 2 files changed, 84 insertions(+), 130 deletions(-)

On Fri, Dec 9, 2022 at 3:31 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> After static_kwargs has been changed to an empty dictionary, it has
> no functional effect and can be removed.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  meson.build     | 212 +++++++++++++++++++-----------------------------
>  tcg/meson.build |   2 +-
>  2 files changed, 84 insertions(+), 130 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index dced840bfbee..9ccbe0f6e4ee 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -18,7 +18,6 @@ sh = find_program('sh')
>  cc = meson.get_compiler('c')
>  config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
>  enable_modules = 'CONFIG_MODULES' in config_host
> -static_kwargs = {}
>
>  # Temporary directory used for files created while
>  # configure runs. Since it is in the build directory
> @@ -510,7 +509,7 @@ gdbus_codegen = not_found
>  gdbus_codegen_error = '@0@ requires gdbus-codegen, please install libgio'
>  if not get_option('gio').auto() or have_system
>    gio = dependency('gio-2.0', required: get_option('gio'),
> -                   method: 'pkg-config', kwargs: static_kwargs)
> +                   method: 'pkg-config')
>    if gio.found() and not cc.links('''
>      #include <gio/gio.h>
>      int main(void)
> @@ -527,7 +526,7 @@ if not get_option('gio').auto() or have_system
>      gdbus_codegen = find_program(gio.get_variable('gdbus_codegen'),
>                                   required: get_option('gio'))
>      gio_unix = dependency('gio-unix-2.0', required: get_option('gio'),
> -                          method: 'pkg-config', kwargs: static_kwargs)
> +                          method: 'pkg-config')
>      gio = declare_dependency(dependencies: [gio, gio_unix],
>                               version: gio.version())
>    endif
> @@ -540,20 +539,19 @@ endif
>  lttng = not_found
>  if 'ust' in get_option('trace_backends')
>    lttng = dependency('lttng-ust', required: true, version: '>= 2.1',
> -                     method: 'pkg-config', kwargs: static_kwargs)
> +                     method: 'pkg-config')
>  endif
>  pixman = not_found
>  if have_system or have_tools
>    pixman = dependency('pixman-1', required: have_system, version:'>=0.21.8',
> -                      method: 'pkg-config', kwargs: static_kwargs)
> +                      method: 'pkg-config')
>  endif
> -zlib = dependency('zlib', required: true, kwargs: static_kwargs)
> +zlib = dependency('zlib', required: true)
>
>  libaio = not_found
>  if not get_option('linux_aio').auto() or have_block
>    libaio = cc.find_library('aio', has_headers: ['libaio.h'],
> -                           required: get_option('linux_aio'),
> -                           kwargs: static_kwargs)
> +                           required: get_option('linux_aio'))
>  endif
>
>  linux_io_uring_test = '''
> @@ -566,7 +564,7 @@ linux_io_uring = not_found
>  if not get_option('linux_io_uring').auto() or have_block
>    linux_io_uring = dependency('liburing', version: '>=0.3',
>                                required: get_option('linux_io_uring'),
> -                              method: 'pkg-config', kwargs: static_kwargs)
> +                              method: 'pkg-config')
>    if not cc.links(linux_io_uring_test)
>      linux_io_uring = not_found
>    endif
> @@ -576,7 +574,7 @@ libnfs = not_found
>  if not get_option('libnfs').auto() or have_block
>    libnfs = dependency('libnfs', version: '>=1.9.3',
>                        required: get_option('libnfs'),
> -                      method: 'pkg-config', kwargs: static_kwargs)
> +                      method: 'pkg-config')
>  endif
>
>  libattr_test = '''
> @@ -596,8 +594,7 @@ if get_option('attr').allowed()
>      libattr = declare_dependency()
>    else
>      libattr = cc.find_library('attr', has_headers: ['attr/xattr.h'],
> -                              required: get_option('attr'),
> -                              kwargs: static_kwargs)
> +                              required: get_option('attr'))
>      if libattr.found() and not \
>        cc.links(libattr_test, dependencies: libattr, args: '-DCONFIG_LIBATTR')
>        libattr = not_found
> @@ -632,7 +629,7 @@ seccomp_has_sysrawrc = false
>  if not get_option('seccomp').auto() or have_system or have_tools
>    seccomp = dependency('libseccomp', version: '>=2.3.0',
>                         required: get_option('seccomp'),
> -                       method: 'pkg-config', kwargs: static_kwargs)
> +                       method: 'pkg-config')
>    if seccomp.found()
>      seccomp_has_sysrawrc = cc.has_header_symbol('seccomp.h',
>                                                  'SCMP_FLTATR_API_SYSRAWRC',
> @@ -643,8 +640,7 @@ endif
>  libcap_ng = not_found
>  if not get_option('cap_ng').auto() or have_system or have_tools
>    libcap_ng = cc.find_library('cap-ng', has_headers: ['cap-ng.h'],
> -                              required: get_option('cap_ng'),
> -                              kwargs: static_kwargs)
> +                              required: get_option('cap_ng'))
>  endif
>  if libcap_ng.found() and not cc.links('''
>     #include <cap-ng.h>
> @@ -665,13 +661,13 @@ if get_option('xkbcommon').auto() and not have_system and not have_tools
>    xkbcommon = not_found
>  else
>    xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'),
> -                         method: 'pkg-config', kwargs: static_kwargs)
> +                         method: 'pkg-config')
>  endif
>
>  slirp = not_found
>  if not get_option('slirp').auto() or have_system
>    slirp = dependency('slirp', required: get_option('slirp'),
> -                     method: 'pkg-config', kwargs: static_kwargs)
> +                     method: 'pkg-config')
>    # slirp < 4.7 is incompatible with CFI support in QEMU.  This is because
>    # it passes function pointers within libslirp as callbacks for timers.
>    # When using a system-wide shared libslirp, the type information for the
> @@ -691,8 +687,7 @@ endif
>  vde = not_found
>  if not get_option('vde').auto() or have_system or have_tools
>    vde = cc.find_library('vdeplug', has_headers: ['libvdeplug.h'],
> -                           required: get_option('vde'),
> -                           kwargs: static_kwargs)
> +                           required: get_option('vde'))
>  endif
>  if vde.found() and not cc.links('''
>     #include <libvdeplug.h>
> @@ -714,35 +709,35 @@ endif
>  pulse = not_found
>  if not get_option('pa').auto() or (targetos == 'linux' and have_system)
>    pulse = dependency('libpulse', required: get_option('pa'),
> -                     method: 'pkg-config', kwargs: static_kwargs)
> +                     method: 'pkg-config')
>  endif
>  alsa = not_found
>  if not get_option('alsa').auto() or (targetos == 'linux' and have_system)
>    alsa = dependency('alsa', required: get_option('alsa'),
> -                    method: 'pkg-config', kwargs: static_kwargs)
> +                    method: 'pkg-config')
>  endif
>  jack = not_found
>  if not get_option('jack').auto() or have_system
>    jack = dependency('jack', required: get_option('jack'),
> -                    method: 'pkg-config', kwargs: static_kwargs)
> +                    method: 'pkg-config')
>  endif
>  sndio = not_found
>  if not get_option('sndio').auto() or have_system
>    sndio = dependency('sndio', required: get_option('sndio'),
> -                    method: 'pkg-config', kwargs: static_kwargs)
> +                    method: 'pkg-config')
>  endif
>
>  spice_protocol = not_found
>  if not get_option('spice_protocol').auto() or have_system
>    spice_protocol = dependency('spice-protocol', version: '>=0.12.3',
>                                required: get_option('spice_protocol'),
> -                              method: 'pkg-config', kwargs: static_kwargs)
> +                              method: 'pkg-config')
>  endif
>  spice = not_found
>  if not get_option('spice').auto() or have_system
>    spice = dependency('spice-server', version: '>=0.12.5',
>                       required: get_option('spice'),
> -                     method: 'pkg-config', kwargs: static_kwargs)
> +                     method: 'pkg-config')
>  endif
>  spice_headers = spice.partial_dependency(compile_args: true, includes: true)
>
> @@ -752,13 +747,13 @@ libiscsi = not_found
>  if not get_option('libiscsi').auto() or have_block
>    libiscsi = dependency('libiscsi', version: '>=1.9.0',
>                           required: get_option('libiscsi'),
> -                         method: 'pkg-config', kwargs: static_kwargs)
> +                         method: 'pkg-config')
>  endif
>  zstd = not_found
>  if not get_option('zstd').auto() or have_block
>    zstd = dependency('libzstd', version: '>=1.4.0',
>                      required: get_option('zstd'),
> -                    method: 'pkg-config', kwargs: static_kwargs)
> +                    method: 'pkg-config')
>  endif
>  virgl = not_found
>
> @@ -766,29 +761,25 @@ have_vhost_user_gpu = have_tools and targetos == 'linux' and pixman.found()
>  if not get_option('virglrenderer').auto() or have_system or have_vhost_user_gpu
>    virgl = dependency('virglrenderer',
>                       method: 'pkg-config',
> -                     required: get_option('virglrenderer'),
> -                     kwargs: static_kwargs)
> +                     required: get_option('virglrenderer'))
>  endif
>  blkio = not_found
>  if not get_option('blkio').auto() or have_block
>    blkio = dependency('blkio',
>                       method: 'pkg-config',
> -                     required: get_option('blkio'),
> -                     kwargs: static_kwargs)
> +                     required: get_option('blkio'))
>  endif
>  curl = not_found
>  if not get_option('curl').auto() or have_block
>    curl = dependency('libcurl', version: '>=7.29.0',
>                      method: 'pkg-config',
> -                    required: get_option('curl'),
> -                    kwargs: static_kwargs)
> +                    required: get_option('curl'))
>  endif
>  libudev = not_found
>  if targetos == 'linux' and (have_system or have_tools)
>    libudev = dependency('libudev',
>                         method: 'pkg-config',
> -                       required: get_option('libudev'),
> -                       kwargs: static_kwargs)
> +                       required: get_option('libudev'))
>  endif
>
>  mpathlibs = [libudev]
> @@ -823,18 +814,15 @@ if targetos == 'linux' and have_tools and get_option('mpath').allowed()
>            return 0;
>        }'''
>    libmpathpersist = cc.find_library('mpathpersist',
> -                                    required: get_option('mpath'),
> -                                    kwargs: static_kwargs)
> +                                    required: get_option('mpath'))
>    if libmpathpersist.found()
>      mpathlibs += libmpathpersist
>      if get_option('prefer_static')
>        mpathlibs += cc.find_library('devmapper',
> -                                     required: get_option('mpath'),
> -                                     kwargs: static_kwargs)
> +                                     required: get_option('mpath'))
>      endif
>      mpathlibs += cc.find_library('multipath',
> -                                 required: get_option('mpath'),
> -                                 kwargs: static_kwargs)
> +                                 required: get_option('mpath'))
>      foreach lib: mpathlibs
>        if not lib.found()
>          mpathlibs = []
> @@ -884,8 +872,7 @@ if have_system and get_option('curses').allowed()
>    curses_dep_list = targetos == 'windows' ? ['ncurses', 'ncursesw'] : ['ncursesw']
>    curses = dependency(curses_dep_list,
>                        required: false,
> -                      method: 'pkg-config',
> -                      kwargs: static_kwargs)
> +                      method: 'pkg-config')
>    msg = get_option('curses').enabled() ? 'curses library not found' : ''
>    curses_compile_args = ['-DNCURSES_WIDECHAR=1']
>    if curses.found()
> @@ -907,8 +894,7 @@ if have_system and get_option('curses').allowed()
>        curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw'])
>        foreach curses_libname : curses_libname_list
>          libcurses = cc.find_library(curses_libname,
> -                                    required: false,
> -                                    kwargs: static_kwargs)
> +                                    required: false)
>          if libcurses.found()
>            if cc.links(curses_test, args: curses_compile_args, dependencies: libcurses)
>              curses = declare_dependency(compile_args: curses_compile_args,
> @@ -958,8 +944,7 @@ endif
>  brlapi = not_found
>  if not get_option('brlapi').auto() or have_system
>    brlapi = cc.find_library('brlapi', has_headers: ['brlapi.h'],
> -                         required: get_option('brlapi'),
> -                         kwargs: static_kwargs)
> +                         required: get_option('brlapi'))
>    if brlapi.found() and not cc.links('''
>       #include <brlapi.h>
>       #include <stddef.h>
> @@ -975,7 +960,7 @@ endif
>
>  sdl = not_found
>  if not get_option('sdl').auto() or have_system
> -  sdl = dependency('sdl2', required: get_option('sdl'), kwargs: static_kwargs)
> +  sdl = dependency('sdl2', required: get_option('sdl'))
>    sdl_image = not_found
>  endif
>  if sdl.found()
> @@ -983,7 +968,7 @@ if sdl.found()
>    sdl = declare_dependency(compile_args: '-Wno-undef',
>                             dependencies: sdl)
>    sdl_image = dependency('SDL2_image', required: get_option('sdl_image'),
> -                         method: 'pkg-config', kwargs: static_kwargs)
> +                         method: 'pkg-config')
>  else
>    if get_option('sdl_image').enabled()
>      error('sdl-image required, but SDL was @0@'.format(
> @@ -994,11 +979,9 @@ endif
>
>  rbd = not_found
>  if not get_option('rbd').auto() or have_block
> -  librados = cc.find_library('rados', required: get_option('rbd'),
> -                             kwargs: static_kwargs)
> +  librados = cc.find_library('rados', required: get_option('rbd'))
>    librbd = cc.find_library('rbd', has_headers: ['rbd/librbd.h'],
> -                           required: get_option('rbd'),
> -                           kwargs: static_kwargs)
> +                           required: get_option('rbd'))
>    if librados.found() and librbd.found()
>      if cc.links('''
>        #include <stdio.h>
> @@ -1026,7 +1009,7 @@ glusterfs_iocb_has_stat = false
>  if not get_option('glusterfs').auto() or have_block
>    glusterfs = dependency('glusterfs-api', version: '>=3',
>                           required: get_option('glusterfs'),
> -                         method: 'pkg-config', kwargs: static_kwargs)
> +                         method: 'pkg-config')
>    if glusterfs.found()
>      glusterfs_ftruncate_has_stat = cc.links('''
>        #include <glusterfs/api/glfs.h>
> @@ -1061,15 +1044,13 @@ libssh = not_found
>  if not get_option('libssh').auto() or have_block
>    libssh = dependency('libssh', version: '>=0.8.7',
>                      method: 'pkg-config',
> -                    required: get_option('libssh'),
> -                    kwargs: static_kwargs)
> +                    required: get_option('libssh'))
>  endif
>
>  libbzip2 = not_found
>  if not get_option('bzip2').auto() or have_block
>    libbzip2 = cc.find_library('bz2', has_headers: ['bzlib.h'],
> -                             required: get_option('bzip2'),
> -                             kwargs: static_kwargs)
> +                             required: get_option('bzip2'))
>    if libbzip2.found() and not cc.links('''
>       #include <bzlib.h>
>       int main(void) { BZ2_bzlibVersion(); return 0; }''', dependencies: libbzip2)
> @@ -1085,8 +1066,7 @@ endif
>  liblzfse = not_found
>  if not get_option('lzfse').auto() or have_block
>    liblzfse = cc.find_library('lzfse', has_headers: ['lzfse.h'],
> -                             required: get_option('lzfse'),
> -                             kwargs: static_kwargs)
> +                             required: get_option('lzfse'))
>  endif
>  if liblzfse.found() and not cc.links('''
>     #include <lzfse.h>
> @@ -1104,8 +1084,7 @@ if get_option('oss').allowed() and have_system
>    if not cc.has_header('sys/soundcard.h')
>      # not found
>    elif targetos == 'netbsd'
> -    oss = cc.find_library('ossaudio', required: get_option('oss'),
> -                          kwargs: static_kwargs)
> +    oss = cc.find_library('ossaudio', required: get_option('oss'))
>    else
>      oss = declare_dependency()
>    endif
> @@ -1138,7 +1117,7 @@ endif
>  opengl = not_found
>  if not get_option('opengl').auto() or have_system or have_vhost_user_gpu
>    epoxy = dependency('epoxy', method: 'pkg-config',
> -                      required: get_option('opengl'), kwargs: static_kwargs)
> +                      required: get_option('opengl'))
>    if cc.has_header('epoxy/egl.h', dependencies: epoxy)
>      opengl = epoxy
>    elif get_option('opengl').enabled()
> @@ -1147,8 +1126,7 @@ if not get_option('opengl').auto() or have_system or have_vhost_user_gpu
>  endif
>  gbm = not_found
>  if (have_system or have_tools) and (virgl.found() or opengl.found())
> -  gbm = dependency('gbm', method: 'pkg-config', required: false,
> -                   kwargs: static_kwargs)
> +  gbm = dependency('gbm', method: 'pkg-config', required: false)
>  endif
>  have_vhost_user_gpu = have_vhost_user_gpu and virgl.found() and opengl.found() and gbm.found()
>
> @@ -1170,16 +1148,14 @@ if get_option('gnutls').enabled() or (get_option('gnutls').auto() and have_syste
>    # the platform support requirements
>    gnutls_crypto = dependency('gnutls', version: '>=3.6.14',
>                               method: 'pkg-config',
> -                             required: false,
> -                             kwargs: static_kwargs)
> +                             required: false)
>    if gnutls_crypto.found()
>      gnutls = gnutls_crypto
>    else
>      # Our min version if all we need is TLS
>      gnutls = dependency('gnutls', version: '>=3.5.18',
>                          method: 'pkg-config',
> -                        required: get_option('gnutls'),
> -                        kwargs: static_kwargs)
> +                        required: get_option('gnutls'))
>    endif
>  endif
>
> @@ -1206,34 +1182,31 @@ if not gnutls_crypto.found()
>    if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled()
>      gcrypt = dependency('libgcrypt', version: '>=1.8',
>                          method: 'config-tool',
> -                        required: get_option('gcrypt'),
> -                        kwargs: static_kwargs)
> +                        required: get_option('gcrypt'))
>      # Debian has removed -lgpg-error from libgcrypt-config
>      # as it "spreads unnecessary dependencies" which in
>      # turn breaks static builds...
>      if gcrypt.found() and get_option('prefer_static')
>        gcrypt = declare_dependency(dependencies: [
>          gcrypt,
> -        cc.find_library('gpg-error', required: true, kwargs: static_kwargs)])
> +        cc.find_library('gpg-error', required: true)])
>      endif
>    endif
>    if (not get_option('nettle').auto() or have_system) and not gcrypt.found()
>      nettle = dependency('nettle', version: '>=3.4',
>                          method: 'pkg-config',
> -                        required: get_option('nettle'),
> -                        kwargs: static_kwargs)
> +                        required: get_option('nettle'))
>      if nettle.found() and not cc.has_header('nettle/xts.h', dependencies: nettle)
>        xts = 'private'
>      endif
>    endif
>  endif
>
> -gmp = dependency('gmp', required: false, method: 'pkg-config', kwargs: static_kwargs)
> +gmp = dependency('gmp', required: false, method: 'pkg-config')
>  if nettle.found() and gmp.found()
>    hogweed = dependency('hogweed', version: '>=3.4',
>                         method: 'pkg-config',
> -                       required: get_option('nettle'),
> -                       kwargs: static_kwargs)
> +                       required: get_option('nettle'))
>  endif
>
>
> @@ -1245,20 +1218,17 @@ have_gtk_clipboard = get_option('gtk_clipboard').enabled()
>  if not get_option('gtk').auto() or have_system
>    gtk = dependency('gtk+-3.0', version: '>=3.22.0',
>                     method: 'pkg-config',
> -                   required: get_option('gtk'),
> -                   kwargs: static_kwargs)
> +                   required: get_option('gtk'))
>    if gtk.found()
>      gtkx11 = dependency('gtk+-x11-3.0', version: '>=3.22.0',
>                          method: 'pkg-config',
> -                        required: false,
> -                        kwargs: static_kwargs)
> +                        required: false)
>      gtk = declare_dependency(dependencies: [gtk, gtkx11])
>
>      if not get_option('vte').auto() or have_system
>        vte = dependency('vte-2.91',
>                         method: 'pkg-config',
> -                       required: get_option('vte'),
> -                       kwargs: static_kwargs)
> +                       required: get_option('vte'))
>      endif
>    elif have_gtk_clipboard
>      error('GTK clipboard requested, but GTK not found')
> @@ -1267,13 +1237,12 @@ endif
>
>  x11 = not_found
>  if gtkx11.found()
> -  x11 = dependency('x11', method: 'pkg-config', required: gtkx11.found(),
> -                   kwargs: static_kwargs)
> +  x11 = dependency('x11', method: 'pkg-config', required: gtkx11.found())
>  endif
>  png = not_found
>  if get_option('png').allowed() and have_system
>     png = dependency('libpng', version: '>=1.6.34', required: get_option('png'),
> -                    method: 'pkg-config', kwargs: static_kwargs)
> +                    method: 'pkg-config')
>  endif
>  vnc = not_found
>  jpeg = not_found
> @@ -1281,10 +1250,9 @@ sasl = not_found
>  if get_option('vnc').allowed() and have_system
>    vnc = declare_dependency() # dummy dependency
>    jpeg = dependency('libjpeg', required: get_option('vnc_jpeg'),
> -                    method: 'pkg-config', kwargs: static_kwargs)
> +                    method: 'pkg-config')
>    sasl = cc.find_library('sasl2', has_headers: ['sasl/sasl.h'],
> -                         required: get_option('vnc_sasl'),
> -                         kwargs: static_kwargs)
> +                         required: get_option('vnc_sasl'))
>    if sasl.found()
>      sasl = declare_dependency(dependencies: sasl,
>                                compile_args: '-DSTRUCT_IOVEC_DEFINED')
> @@ -1294,8 +1262,7 @@ endif
>  pam = not_found
>  if not get_option('auth_pam').auto() or have_system
>    pam = cc.find_library('pam', has_headers: ['security/pam_appl.h'],
> -                        required: get_option('auth_pam'),
> -                        kwargs: static_kwargs)
> +                        required: get_option('auth_pam'))
>  endif
>  if pam.found() and not cc.links('''
>     #include <stddef.h>
> @@ -1319,8 +1286,7 @@ endif
>  snappy = not_found
>  if not get_option('snappy').auto() or have_system
>    snappy = cc.find_library('snappy', has_headers: ['snappy-c.h'],
> -                           required: get_option('snappy'),
> -                           kwargs: static_kwargs)
> +                           required: get_option('snappy'))
>  endif
>  if snappy.found() and not linker.links('''
>     #include <snappy-c.h>
> @@ -1336,8 +1302,7 @@ endif
>  lzo = not_found
>  if not get_option('lzo').auto() or have_system
>    lzo = cc.find_library('lzo2', has_headers: ['lzo/lzo1x.h'],
> -                        required: get_option('lzo'),
> -                        kwargs: static_kwargs)
> +                        required: get_option('lzo'))
>  endif
>  if lzo.found() and not cc.links('''
>     #include <lzo/lzo1x.h>
> @@ -1353,8 +1318,7 @@ endif
>  numa = not_found
>  if not get_option('numa').auto() or have_system or have_tools
>    numa = cc.find_library('numa', has_headers: ['numa.h'],
> -                              required: get_option('numa'),
> -                              kwargs: static_kwargs)
> +                              required: get_option('numa'))
>  endif
>  if numa.found() and not cc.links('''
>     #include <numa.h>
> @@ -1372,10 +1336,8 @@ rdma = not_found
>  if not get_option('rdma').auto() or have_system
>    libumad = cc.find_library('ibumad', required: get_option('rdma'))
>    rdma_libs = [cc.find_library('rdmacm', has_headers: ['rdma/rdma_cma.h'],
> -                               required: get_option('rdma'),
> -                               kwargs: static_kwargs),
> -               cc.find_library('ibverbs', required: get_option('rdma'),
> -                               kwargs: static_kwargs),
> +                               required: get_option('rdma')),
> +               cc.find_library('ibverbs', required: get_option('rdma')),
>                 libumad]
>    rdma = declare_dependency(dependencies: rdma_libs)
>    foreach lib: rdma_libs
> @@ -1388,30 +1350,30 @@ endif
>  xen = not_found
>  if get_option('xen').enabled() or (get_option('xen').auto() and have_system)
>    xencontrol = dependency('xencontrol', required: false,
> -                          method: 'pkg-config', kwargs: static_kwargs)
> +                          method: 'pkg-config')
>    if xencontrol.found()
>      xen_pc = declare_dependency(version: xencontrol.version(),
>        dependencies: [
>          xencontrol,
>          # disabler: true makes xen_pc.found() return false if any is not found
>          dependency('xenstore', required: false,
> -                   method: 'pkg-config', kwargs: static_kwargs,
> +                   method: 'pkg-config',
>                     disabler: true),
>          dependency('xenforeignmemory', required: false,
> -                   method: 'pkg-config', kwargs: static_kwargs,
> +                   method: 'pkg-config',
>                     disabler: true),
>          dependency('xengnttab', required: false,
> -                   method: 'pkg-config', kwargs: static_kwargs,
> +                   method: 'pkg-config',
>                     disabler: true),
>          dependency('xenevtchn', required: false,
> -                   method: 'pkg-config', kwargs: static_kwargs,
> +                   method: 'pkg-config',
>                     disabler: true),
>          dependency('xendevicemodel', required: false,
> -                   method: 'pkg-config', kwargs: static_kwargs,
> +                   method: 'pkg-config',
>                     disabler: true),
>          # optional, no "disabler: true"
>          dependency('xentoolcore', required: false,
> -                   method: 'pkg-config', kwargs: static_kwargs)])
> +                   method: 'pkg-config')])
>      if xen_pc.found()
>        xen = xen_pc
>      endif
> @@ -1469,60 +1431,53 @@ have_xen_pci_passthrough = get_option('xen_pci_passthrough') \
>  cacard = not_found
>  if not get_option('smartcard').auto() or have_system
>    cacard = dependency('libcacard', required: get_option('smartcard'),
> -                      version: '>=2.5.1', method: 'pkg-config',
> -                      kwargs: static_kwargs)
> +                      version: '>=2.5.1', method: 'pkg-config')
>  endif
>  u2f = not_found
>  if have_system
>    u2f = dependency('u2f-emu', required: get_option('u2f'),
> -                   method: 'pkg-config',
> -                   kwargs: static_kwargs)
> +                   method: 'pkg-config')
>  endif
>  canokey = not_found
>  if have_system
>    canokey = dependency('canokey-qemu', required: get_option('canokey'),
> -                   method: 'pkg-config',
> -                   kwargs: static_kwargs)
> +                   method: 'pkg-config')
>  endif
>  usbredir = not_found
>  if not get_option('usb_redir').auto() or have_system
>    usbredir = dependency('libusbredirparser-0.5', required: get_option('usb_redir'),
> -                        version: '>=0.6', method: 'pkg-config',
> -                        kwargs: static_kwargs)
> +                        version: '>=0.6', method: 'pkg-config')
>  endif
>  libusb = not_found
>  if not get_option('libusb').auto() or have_system
>    libusb = dependency('libusb-1.0', required: get_option('libusb'),
> -                      version: '>=1.0.13', method: 'pkg-config',
> -                      kwargs: static_kwargs)
> +                      version: '>=1.0.13', method: 'pkg-config')
>  endif
>
>  libpmem = not_found
>  if not get_option('libpmem').auto() or have_system
>    libpmem = dependency('libpmem', required: get_option('libpmem'),
> -                       method: 'pkg-config', kwargs: static_kwargs)
> +                       method: 'pkg-config')
>  endif
>  libdaxctl = not_found
>  if not get_option('libdaxctl').auto() or have_system
>    libdaxctl = dependency('libdaxctl', required: get_option('libdaxctl'),
> -                         version: '>=57', method: 'pkg-config',
> -                         kwargs: static_kwargs)
> +                         version: '>=57', method: 'pkg-config')
>  endif
>  tasn1 = not_found
>  if gnutls.found()
>    tasn1 = dependency('libtasn1',
> -                     method: 'pkg-config',
> -                     kwargs: static_kwargs)
> +                     method: 'pkg-config')
>  endif
>  keyutils = dependency('libkeyutils', required: false,
> -                      method: 'pkg-config', kwargs: static_kwargs)
> +                      method: 'pkg-config')
>
>  has_gettid = cc.has_function('gettid')
>
>  # libselinux
>  selinux = dependency('libselinux',
>                       required: get_option('selinux'),
> -                     method: 'pkg-config', kwargs: static_kwargs)
> +                     method: 'pkg-config')
>
>  # Malloc tests
>
> @@ -1586,8 +1541,7 @@ if get_option('fuse').disabled() and get_option('fuse_lseek').enabled()
>  endif
>
>  fuse = dependency('fuse3', required: get_option('fuse'),
> -                  version: '>=3.1', method: 'pkg-config',
> -                  kwargs: static_kwargs)
> +                  version: '>=3.1', method: 'pkg-config')
>
>  fuse_lseek = not_found
>  if get_option('fuse_lseek').allowed()
> @@ -2677,7 +2631,7 @@ genh += custom_target('config-poison.h',
>  capstone = not_found
>  if not get_option('capstone').auto() or have_system or have_user
>    capstone = dependency('capstone', version: '>=3.0.5',
> -                        kwargs: static_kwargs, method: 'pkg-config',
> +                        method: 'pkg-config',
>                          required: get_option('capstone'))
>
>    # Some versions of capstone have broken pkg-config file
> @@ -2713,7 +2667,7 @@ if have_system
>    fdt_opt = get_option('fdt')
>    if fdt_opt in ['enabled', 'auto', 'system']
>      have_internal = fs.exists(meson.current_source_dir() / 'dtc/libfdt/Makefile.libfdt')
> -    fdt = cc.find_library('fdt', kwargs: static_kwargs,
> +    fdt = cc.find_library('fdt',
>                            required: fdt_opt == 'system' or
>                                      fdt_opt == 'enabled' and not have_internal)
>      if fdt.found() and cc.links('''
> diff --git a/tcg/meson.build b/tcg/meson.build
> index c4c63b19d4ed..3db551bb3485 100644
> --- a/tcg/meson.build
> +++ b/tcg/meson.build
> @@ -12,7 +12,7 @@ tcg_ss.add(files(
>
>  if get_option('tcg_interpreter')
>    libffi = dependency('libffi', version: '>=3.0', required: true,
> -                      method: 'pkg-config', kwargs: static_kwargs)
> +                      method: 'pkg-config')
>    specific_ss.add(libffi)
>    specific_ss.add(files('tci.c'))
>  endif
> --
> 2.38.1
>
>

On Fri, Dec 09, 2022 at 12:23:49PM +0100, Paolo Bonzini wrote:
> After static_kwargs has been changed to an empty dictionary, it has
> no functional effect and can be removed.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  meson.build     | 212 +++++++++++++++++++-----------------------------
>  tcg/meson.build |   2 +-
>  2 files changed, 84 insertions(+), 130 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel