From nobody Tue Feb 10 07:23:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683798759; cv=none; d=zohomail.com; s=zohoarc; b=GwkjQt2JitfdhlMvQS7DqMxvY++Ibu1z5MQhP7psl0KVs1hMgB8pFK8iYHMdggwcRgwWnfwpfOO9DB2WQ/iDho9sSK14BuNIZSCS8lWmM06j/LO1C6T/4L7ryU4Uw7q1UUTrzJzYF0gxQQTL9yqxlzpVfK1dGzFbNkRL9bgS3Aw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683798759; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h9BhLWtzKVX4Uut39Logq79Y/KSeDVQ3Pho9Y2kC7uk=; b=EKO15qWFYk/UId5H5AxJzoWEVAnSkmPPXbAyzsRfLUvfZAfrXnKYO1RJ9DHKbwXDJdTv/lxKWJ5NubGBA6MGPL8plUEGenwJOz48j9hFRrGsj2k7Z11iiFkS0zZbUT5ewf2REFarm5ioOzKUJxCWVFe2JXxrcgVBKStJ4zyqD44= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683798759368886.0783970352943; Thu, 11 May 2023 02:52:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px2wi-0000KM-4y; Thu, 11 May 2023 05:50:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1px2wf-0000HW-Ts for qemu-devel@nongnu.org; Thu, 11 May 2023 05:50:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1px2wc-0006fG-9l for qemu-devel@nongnu.org; Thu, 11 May 2023 05:50:45 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-237-9dEpDrmAP5K-26W9iIq7SA-1; Thu, 11 May 2023 05:50:40 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-50d89279d95so2374567a12.1 for ; Thu, 11 May 2023 02:50:40 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id gc9-20020a1709072b0900b0094f49f58019sm3757485ejc.27.2023.05.11.02.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 02:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683798641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h9BhLWtzKVX4Uut39Logq79Y/KSeDVQ3Pho9Y2kC7uk=; b=Zn7Fi5+LivK7vsZRRcNBwP+OSJci7fUUpkM3lyRrTkLduZfX+wqo6mFM2kRacUNF/9RlkX wTN53y7mRqFsdgjVXhzJaXlWLQgbzem9qZ7lm6/8Rp7IdHtjhg9LWzCEWNgmcfvEwTxDMX f+xJRBJjZY2fO79jURFucSe0mVK38Tw= X-MC-Unique: 9dEpDrmAP5K-26W9iIq7SA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683798639; x=1686390639; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h9BhLWtzKVX4Uut39Logq79Y/KSeDVQ3Pho9Y2kC7uk=; b=bmMQtiQ8BVMFGCDVZ5FoC9EOVk+P6JJGSzrc4BWC2pTGDDhdJa0ujBd3/gmEWebtNT dV/wUuH8JuWoqU43PLbAqBcCtswSG9B6vDxEteVJIjO6e6utefHHXv6b6zoRQ3E7p+o1 IVfg8nb9E71E8dbJRQHW8Eqx+AZ/nmTbazIE3h5eFsj+ZbrWRaz47tyMhGEsbl+d5rqq Ymcs/XIsNfWleIGvb3meqIPsIoKW5oGMIWOTrYnE7u3hutvTiUxkgcyAbB3uBwts3MFG Amc0hM1E8Eyj7L5AU3tFf6NCxQNT7ddv5dC59AZjYHhKZrClrquW3gKJK4ancEgeriv5 SjiA== X-Gm-Message-State: AC+VfDx1uEZS8zK4oD4hMQRGE6e7vyWiRpM7e8fpS+f3VZUnWpNL9qX9 N2WeRIzrHQJVu/O5H2L+juDcBPvBCR7ALUfqjvKbcsRAqqTG9L+uCtXmU7cakI+DyKUexZ7DbJT vYrh0JHWz7ngnh+e7JX0xzrLzZeWAon+nC8ty/SyA7kDfJJkhyn2dy3T7q02x985GEDX6SH2+Gh o= X-Received: by 2002:a17:907:9602:b0:965:77d2:7802 with SMTP id gb2-20020a170907960200b0096577d27802mr20417996ejc.0.1683798638497; Thu, 11 May 2023 02:50:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6SGbTSxUevdkOa1WFhSHsfVanF6uCnZb7Wzgu9xhfnRHAL2lAUtmmgEi71eXpaU2my+NsTEA== X-Received: by 2002:a17:907:9602:b0:965:77d2:7802 with SMTP id gb2-20020a170907960200b0096577d27802mr20417968ejc.0.1683798637927; Thu, 11 May 2023 02:50:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 04/24] meson: remove static_kwargs Date: Thu, 11 May 2023 11:50:01 +0200 Message-Id: <20230511095021.1397802-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230511095021.1397802-1-pbonzini@redhat.com> References: <20230511095021.1397802-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683798761454100008 After static_kwargs has been changed to an empty dictionary, it has no functional effect and can be removed. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 215 +++++++++++++++++++----------------------------- tcg/meson.build | 2 +- 2 files changed, 85 insertions(+), 132 deletions(-) diff --git a/meson.build b/meson.build index 4b72ffd465d9..144fa406503c 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,6 @@ targetos =3D host_machine.system() sh =3D find_program('sh') config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') enable_modules =3D 'CONFIG_MODULES' in config_host -static_kwargs =3D {} =20 cc =3D meson.get_compiler('c') all_languages =3D ['c'] @@ -515,7 +514,7 @@ gdbus_codegen =3D not_found gdbus_codegen_error =3D '@0@ requires gdbus-codegen, please install libgio' if not get_option('gio').auto() or have_system gio =3D 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 int main(void) @@ -532,7 +531,7 @@ if not get_option('gio').auto() or have_system gdbus_codegen =3D find_program(gio.get_variable('gdbus_codegen'), required: get_option('gio')) gio_unix =3D dependency('gio-unix-2.0', required: get_option('gio'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') gio =3D declare_dependency(dependencies: [gio, gio_unix], version: gio.version()) endif @@ -545,20 +544,19 @@ endif lttng =3D not_found if 'ust' in get_option('trace_backends') lttng =3D dependency('lttng-ust', required: true, version: '>=3D 2.1', - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif pixman =3D not_found if have_system or have_tools pixman =3D dependency('pixman-1', required: have_system, version:'>=3D0.= 21.8', - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif -zlib =3D dependency('zlib', required: true, kwargs: static_kwargs) +zlib =3D dependency('zlib', required: true) =20 libaio =3D not_found if not get_option('linux_aio').auto() or have_block libaio =3D cc.find_library('aio', has_headers: ['libaio.h'], - required: get_option('linux_aio'), - kwargs: static_kwargs) + required: get_option('linux_aio')) endif =20 linux_io_uring_test =3D ''' @@ -571,7 +569,7 @@ linux_io_uring =3D not_found if not get_option('linux_io_uring').auto() or have_block linux_io_uring =3D dependency('liburing', version: '>=3D0.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 =3D not_found endif @@ -581,7 +579,7 @@ libnfs =3D not_found if not get_option('libnfs').auto() or have_block libnfs =3D dependency('libnfs', version: '>=3D1.9.3', required: get_option('libnfs'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif =20 libattr_test =3D ''' @@ -601,8 +599,7 @@ if get_option('attr').allowed() libattr =3D declare_dependency() else libattr =3D 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_LIBATT= R') libattr =3D not_found @@ -637,7 +634,7 @@ seccomp_has_sysrawrc =3D false if not get_option('seccomp').auto() or have_system or have_tools seccomp =3D dependency('libseccomp', version: '>=3D2.3.0', required: get_option('seccomp'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') if seccomp.found() seccomp_has_sysrawrc =3D cc.has_header_symbol('seccomp.h', 'SCMP_FLTATR_API_SYSRAWRC', @@ -648,8 +645,7 @@ endif libcap_ng =3D not_found if not get_option('cap_ng').auto() or have_system or have_tools libcap_ng =3D 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 @@ -670,13 +666,13 @@ if get_option('xkbcommon').auto() and not have_system= and not have_tools xkbcommon =3D not_found else xkbcommon =3D dependency('xkbcommon', required: get_option('xkbcommon'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif =20 slirp =3D not_found if not get_option('slirp').auto() or have_system slirp =3D 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 @@ -696,8 +692,7 @@ endif vde =3D not_found if not get_option('vde').auto() or have_system or have_tools vde =3D 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 @@ -719,41 +714,41 @@ endif pulse =3D not_found if not get_option('pa').auto() or (targetos =3D=3D 'linux' and have_system) pulse =3D dependency('libpulse', required: get_option('pa'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif alsa =3D not_found if not get_option('alsa').auto() or (targetos =3D=3D 'linux' and have_syst= em) alsa =3D dependency('alsa', required: get_option('alsa'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif jack =3D not_found if not get_option('jack').auto() or have_system jack =3D dependency('jack', required: get_option('jack'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif pipewire =3D not_found if not get_option('pipewire').auto() or (targetos =3D=3D 'linux' and have_= system) pipewire =3D dependency('libpipewire-0.3', version: '>=3D0.3.60', required: get_option('pipewire'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif sndio =3D not_found if not get_option('sndio').auto() or have_system sndio =3D dependency('sndio', required: get_option('sndio'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif =20 spice_protocol =3D not_found if not get_option('spice_protocol').auto() or have_system spice_protocol =3D dependency('spice-protocol', version: '>=3D0.14.0', required: get_option('spice_protocol'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif spice =3D not_found if not get_option('spice').auto() or have_system spice =3D dependency('spice-server', version: '>=3D0.14.0', required: get_option('spice'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif spice_headers =3D spice.partial_dependency(compile_args: true, includes: t= rue) =20 @@ -763,13 +758,13 @@ libiscsi =3D not_found if not get_option('libiscsi').auto() or have_block libiscsi =3D dependency('libiscsi', version: '>=3D1.9.0', required: get_option('libiscsi'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif zstd =3D not_found if not get_option('zstd').auto() or have_block zstd =3D dependency('libzstd', version: '>=3D1.4.0', required: get_option('zstd'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif virgl =3D not_found =20 @@ -777,29 +772,25 @@ have_vhost_user_gpu =3D have_tools and targetos =3D= =3D 'linux' and pixman.found() if not get_option('virglrenderer').auto() or have_system or have_vhost_use= r_gpu virgl =3D dependency('virglrenderer', method: 'pkg-config', - required: get_option('virglrenderer'), - kwargs: static_kwargs) + required: get_option('virglrenderer')) endif blkio =3D not_found if not get_option('blkio').auto() or have_block blkio =3D dependency('blkio', method: 'pkg-config', - required: get_option('blkio'), - kwargs: static_kwargs) + required: get_option('blkio')) endif curl =3D not_found if not get_option('curl').auto() or have_block curl =3D dependency('libcurl', version: '>=3D7.29.0', method: 'pkg-config', - required: get_option('curl'), - kwargs: static_kwargs) + required: get_option('curl')) endif libudev =3D not_found if targetos =3D=3D 'linux' and (have_system or have_tools) libudev =3D dependency('libudev', method: 'pkg-config', - required: get_option('libudev'), - kwargs: static_kwargs) + required: get_option('libudev')) endif =20 mpathlibs =3D [libudev] @@ -834,18 +825,15 @@ if targetos =3D=3D 'linux' and have_tools and get_opt= ion('mpath').allowed() return 0; }''' libmpathpersist =3D cc.find_library('mpathpersist', - required: get_option('mpath'), - kwargs: static_kwargs) + required: get_option('mpath')) if libmpathpersist.found() mpathlibs +=3D libmpathpersist if get_option('prefer_static') mpathlibs +=3D cc.find_library('devmapper', - required: get_option('mpath'), - kwargs: static_kwargs) + required: get_option('mpath')) endif mpathlibs +=3D cc.find_library('multipath', - required: get_option('mpath'), - kwargs: static_kwargs) + required: get_option('mpath')) foreach lib: mpathlibs if not lib.found() mpathlibs =3D [] @@ -895,8 +883,7 @@ if have_system and get_option('curses').allowed() curses_dep_list =3D targetos =3D=3D 'windows' ? ['ncurses', 'ncursesw'] = : ['ncursesw'] curses =3D dependency(curses_dep_list, required: false, - method: 'pkg-config', - kwargs: static_kwargs) + method: 'pkg-config') msg =3D get_option('curses').enabled() ? 'curses library not found' : '' curses_compile_args =3D ['-DNCURSES_WIDECHAR=3D1'] if curses.found() @@ -918,8 +905,7 @@ if have_system and get_option('curses').allowed() curses_libname_list =3D (targetos =3D=3D 'windows' ? ['pdcurses'] : = ['ncursesw', 'cursesw']) foreach curses_libname : curses_libname_list libcurses =3D 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 =3D declare_dependency(compile_args: curses_compile_arg= s, @@ -969,8 +955,7 @@ endif brlapi =3D not_found if not get_option('brlapi').auto() or have_system brlapi =3D 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 #include @@ -986,7 +971,7 @@ endif =20 sdl =3D not_found if not get_option('sdl').auto() or have_system - sdl =3D dependency('sdl2', required: get_option('sdl'), kwargs: static_k= wargs) + sdl =3D dependency('sdl2', required: get_option('sdl')) sdl_image =3D not_found endif if sdl.found() @@ -994,7 +979,7 @@ if sdl.found() sdl =3D declare_dependency(compile_args: '-Wno-undef', dependencies: sdl) sdl_image =3D 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( @@ -1005,11 +990,9 @@ endif =20 rbd =3D not_found if not get_option('rbd').auto() or have_block - librados =3D cc.find_library('rados', required: get_option('rbd'), - kwargs: static_kwargs) + librados =3D cc.find_library('rados', required: get_option('rbd')) librbd =3D 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 @@ -1037,7 +1020,7 @@ glusterfs_iocb_has_stat =3D false if not get_option('glusterfs').auto() or have_block glusterfs =3D dependency('glusterfs-api', version: '>=3D3', required: get_option('glusterfs'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') if glusterfs.found() glusterfs_ftruncate_has_stat =3D cc.links(''' #include @@ -1072,15 +1055,13 @@ libssh =3D not_found if not get_option('libssh').auto() or have_block libssh =3D dependency('libssh', version: '>=3D0.8.7', method: 'pkg-config', - required: get_option('libssh'), - kwargs: static_kwargs) + required: get_option('libssh')) endif =20 libbzip2 =3D not_found if not get_option('bzip2').auto() or have_block libbzip2 =3D 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 int main(void) { BZ2_bzlibVersion(); return 0; }''', dependencies: li= bbzip2) @@ -1096,8 +1077,7 @@ endif liblzfse =3D not_found if not get_option('lzfse').auto() or have_block liblzfse =3D 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 @@ -1115,8 +1095,7 @@ if get_option('oss').allowed() and have_system if not cc.has_header('sys/soundcard.h') # not found elif targetos =3D=3D 'netbsd' - oss =3D cc.find_library('ossaudio', required: get_option('oss'), - kwargs: static_kwargs) + oss =3D cc.find_library('ossaudio', required: get_option('oss')) else oss =3D declare_dependency() endif @@ -1149,7 +1128,7 @@ endif opengl =3D not_found if not get_option('opengl').auto() or have_system or have_vhost_user_gpu epoxy =3D dependency('epoxy', method: 'pkg-config', - required: get_option('opengl'), kwargs: static_kwarg= s) + required: get_option('opengl')) if cc.has_header('epoxy/egl.h', dependencies: epoxy) opengl =3D epoxy elif get_option('opengl').enabled() @@ -1158,8 +1137,7 @@ if not get_option('opengl').auto() or have_system or = have_vhost_user_gpu endif gbm =3D not_found if (have_system or have_tools) and (virgl.found() or opengl.found()) - gbm =3D dependency('gbm', method: 'pkg-config', required: false, - kwargs: static_kwargs) + gbm =3D dependency('gbm', method: 'pkg-config', required: false) endif have_vhost_user_gpu =3D have_vhost_user_gpu and virgl.found() and opengl.f= ound() and gbm.found() =20 @@ -1181,16 +1159,14 @@ if get_option('gnutls').enabled() or (get_option('g= nutls').auto() and have_syste # the platform support requirements gnutls_crypto =3D dependency('gnutls', version: '>=3D3.6.14', method: 'pkg-config', - required: false, - kwargs: static_kwargs) + required: false) if gnutls_crypto.found() gnutls =3D gnutls_crypto else # Our min version if all we need is TLS gnutls =3D dependency('gnutls', version: '>=3D3.5.18', method: 'pkg-config', - required: get_option('gnutls'), - kwargs: static_kwargs) + required: get_option('gnutls')) endif endif =20 @@ -1217,34 +1193,31 @@ if not gnutls_crypto.found() if (not get_option('gcrypt').auto() or have_system) and not get_option('= nettle').enabled() gcrypt =3D dependency('libgcrypt', version: '>=3D1.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 =3D 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 =3D dependency('nettle', version: '>=3D3.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 =3D 'private' endif endif endif =20 -gmp =3D dependency('gmp', required: false, method: 'pkg-config', kwargs: s= tatic_kwargs) +gmp =3D dependency('gmp', required: false, method: 'pkg-config') if nettle.found() and gmp.found() hogweed =3D dependency('hogweed', version: '>=3D3.4', method: 'pkg-config', - required: get_option('nettle'), - kwargs: static_kwargs) + required: get_option('nettle')) endif =20 =20 @@ -1256,20 +1229,17 @@ have_gtk_clipboard =3D get_option('gtk_clipboard').= enabled() if not get_option('gtk').auto() or have_system gtk =3D dependency('gtk+-3.0', version: '>=3D3.22.0', method: 'pkg-config', - required: get_option('gtk'), - kwargs: static_kwargs) + required: get_option('gtk')) if gtk.found() gtkx11 =3D dependency('gtk+-x11-3.0', version: '>=3D3.22.0', method: 'pkg-config', - required: false, - kwargs: static_kwargs) + required: false) gtk =3D declare_dependency(dependencies: [gtk, gtkx11]) =20 if not get_option('vte').auto() or have_system vte =3D 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') @@ -1278,13 +1248,12 @@ endif =20 x11 =3D not_found if gtkx11.found() - x11 =3D dependency('x11', method: 'pkg-config', required: gtkx11.found(), - kwargs: static_kwargs) + x11 =3D dependency('x11', method: 'pkg-config', required: gtkx11.found()) endif png =3D not_found if get_option('png').allowed() and have_system png =3D dependency('libpng', version: '>=3D1.6.34', required: get_optio= n('png'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif vnc =3D not_found jpeg =3D not_found @@ -1292,10 +1261,9 @@ sasl =3D not_found if get_option('vnc').allowed() and have_system vnc =3D declare_dependency() # dummy dependency jpeg =3D dependency('libjpeg', required: get_option('vnc_jpeg'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') sasl =3D 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 =3D declare_dependency(dependencies: sasl, compile_args: '-DSTRUCT_IOVEC_DEFINED') @@ -1305,8 +1273,7 @@ endif pam =3D not_found if not get_option('auth_pam').auto() or have_system pam =3D 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 @@ -1330,8 +1297,7 @@ endif snappy =3D not_found if not get_option('snappy').auto() or have_system snappy =3D 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 @@ -1347,8 +1313,7 @@ endif lzo =3D not_found if not get_option('lzo').auto() or have_system lzo =3D 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 @@ -1364,8 +1329,7 @@ endif numa =3D not_found if not get_option('numa').auto() or have_system or have_tools numa =3D 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 @@ -1383,10 +1347,8 @@ rdma =3D not_found if not get_option('rdma').auto() or have_system libumad =3D cc.find_library('ibumad', required: get_option('rdma')) rdma_libs =3D [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 =3D declare_dependency(dependencies: rdma_libs) foreach lib: rdma_libs @@ -1399,30 +1361,30 @@ endif xen =3D not_found if get_option('xen').enabled() or (get_option('xen').auto() and have_syste= m) xencontrol =3D dependency('xencontrol', required: false, - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') if xencontrol.found() xen_pc =3D declare_dependency(version: xencontrol.version(), dependencies: [ xencontrol, # disabler: true makes xen_pc.found() return false if any is not f= ound 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 =3D xen_pc endif @@ -1480,60 +1442,53 @@ have_xen_pci_passthrough =3D get_option('xen_pci_pa= ssthrough') \ cacard =3D not_found if not get_option('smartcard').auto() or have_system cacard =3D dependency('libcacard', required: get_option('smartcard'), - version: '>=3D2.5.1', method: 'pkg-config', - kwargs: static_kwargs) + version: '>=3D2.5.1', method: 'pkg-config') endif u2f =3D not_found if have_system u2f =3D dependency('u2f-emu', required: get_option('u2f'), - method: 'pkg-config', - kwargs: static_kwargs) + method: 'pkg-config') endif canokey =3D not_found if have_system canokey =3D dependency('canokey-qemu', required: get_option('canokey'), - method: 'pkg-config', - kwargs: static_kwargs) + method: 'pkg-config') endif usbredir =3D not_found if not get_option('usb_redir').auto() or have_system usbredir =3D dependency('libusbredirparser-0.5', required: get_option('u= sb_redir'), - version: '>=3D0.6', method: 'pkg-config', - kwargs: static_kwargs) + version: '>=3D0.6', method: 'pkg-config') endif libusb =3D not_found if not get_option('libusb').auto() or have_system libusb =3D dependency('libusb-1.0', required: get_option('libusb'), - version: '>=3D1.0.13', method: 'pkg-config', - kwargs: static_kwargs) + version: '>=3D1.0.13', method: 'pkg-config') endif =20 libpmem =3D not_found if not get_option('libpmem').auto() or have_system libpmem =3D dependency('libpmem', required: get_option('libpmem'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') endif libdaxctl =3D not_found if not get_option('libdaxctl').auto() or have_system libdaxctl =3D dependency('libdaxctl', required: get_option('libdaxctl'), - version: '>=3D57', method: 'pkg-config', - kwargs: static_kwargs) + version: '>=3D57', method: 'pkg-config') endif tasn1 =3D not_found if gnutls.found() tasn1 =3D dependency('libtasn1', - method: 'pkg-config', - kwargs: static_kwargs) + method: 'pkg-config') endif keyutils =3D dependency('libkeyutils', required: false, - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') =20 has_gettid =3D cc.has_function('gettid') =20 # libselinux selinux =3D dependency('libselinux', required: get_option('selinux'), - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') =20 # Malloc tests =20 @@ -1597,8 +1552,7 @@ if get_option('fuse').disabled() and get_option('fuse= _lseek').enabled() endif =20 fuse =3D dependency('fuse3', required: get_option('fuse'), - version: '>=3D3.1', method: 'pkg-config', - kwargs: static_kwargs) + version: '>=3D3.1', method: 'pkg-config') =20 fuse_lseek =3D not_found if get_option('fuse_lseek').allowed() @@ -1657,7 +1611,6 @@ if not get_option('libdw').auto() or \ (not get_option('prefer_static') and (have_system or have_user)) libdw =3D dependency('libdw', method: 'pkg-config', - kwargs: static_kwargs, required: get_option('libdw')) endif =20 @@ -2731,7 +2684,7 @@ genh +=3D custom_target('config-poison.h', capstone =3D not_found if not get_option('capstone').auto() or have_system or have_user capstone =3D dependency('capstone', version: '>=3D3.0.5', - kwargs: static_kwargs, method: 'pkg-config', + method: 'pkg-config', required: get_option('capstone')) =20 # Some versions of capstone have broken pkg-config file @@ -2767,7 +2720,7 @@ if have_system fdt_opt =3D get_option('fdt') if fdt_opt in ['enabled', 'auto', 'system'] have_internal =3D fs.exists(meson.current_source_dir() / 'dtc/libfdt/M= akefile.libfdt') - fdt =3D cc.find_library('fdt', kwargs: static_kwargs, + fdt =3D cc.find_library('fdt', required: fdt_opt =3D=3D 'system' or fdt_opt =3D=3D '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( =20 if get_option('tcg_interpreter') libffi =3D dependency('libffi', version: '>=3D3.0', required: true, - method: 'pkg-config', kwargs: static_kwargs) + method: 'pkg-config') specific_ss.add(libffi) specific_ss.add(files('tci.c')) endif --=20 2.40.1