From nobody Mon Apr 29 11:04:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1642614144398755.7822883831673; Wed, 19 Jan 2022 09:42:24 -0800 (PST) Received: from localhost ([::1]:55840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAEyV-0007RJ-DI for importer@patchew.org; Wed, 19 Jan 2022 12:42:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAEbM-0002AT-NW for qemu-devel@nongnu.org; Wed, 19 Jan 2022 12:18:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAEbJ-00005d-SN for qemu-devel@nongnu.org; Wed, 19 Jan 2022 12:18:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-22-rFg3uYP2Pu2wFhRXwaeWdg-1; Wed, 19 Jan 2022 12:18:05 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B10E1966321; Wed, 19 Jan 2022 17:18:05 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.80]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0DD057F80D; Wed, 19 Jan 2022 17:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642612692; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nKqSfJX1eSL3Y5vEMztTEg55ka0gOaU3BSMULpZ81VU=; b=B5EFwgf5uA4k3S7Zhw6gUzzMLsKLt2PUXVBh3mMeW3Qtohr17bw7EwJ5L1siNn8vnpRF/R LGW/6ZZtf6qJlV735cOCjikoYg8IP/zESxKjgqZaOa6MCoEuASwA4ZlFoBgbfL6y1pZYVg KCM/xxvhWCIiXJkR+llX8dV9TMn+MBM= X-MC-Unique: rFg3uYP2Pu2wFhRXwaeWdg-1 From: Andrea Bolognani To: qemu-devel@nongnu.org Subject: [PATCH 1/3] meson: Don't force use of libgcrypt-config Date: Wed, 19 Jan 2022 18:17:58 +0100 Message-Id: <20220119171800.491703-2-abologna@redhat.com> In-Reply-To: <20220119171800.491703-1-abologna@redhat.com> References: <20220119171800.491703-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=abologna@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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.133.124; envelope-from=abologna@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1642614145680100003 Content-Type: text/plain; charset="utf-8" libgcrypt 1.9.0 (released in 2021-01) ships with a proper pkg-config file, which Meson's libgcrypt detection code can use if available. Passing 'config-tool' as 'method' when calling dependency(), however, forces Meson to ignore the pkg-config file and always use libgcrypt-config instead. Signed-off-by: Andrea Bolognani --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index 762d7cee85..bc17ba67fd 100644 --- a/meson.build +++ b/meson.build @@ -1036,7 +1036,6 @@ endif 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) # Debian has removed -lgpg-error from libgcrypt-config --=20 2.34.1 From nobody Mon Apr 29 11:04:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1642613178886999.38766141776; Wed, 19 Jan 2022 09:26:18 -0800 (PST) Received: from localhost ([::1]:54374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAEiv-0002gq-Pn for importer@patchew.org; Wed, 19 Jan 2022 12:26:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAEbN-0002AX-HM for qemu-devel@nongnu.org; Wed, 19 Jan 2022 12:18:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:38122) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAEbJ-00005j-SI for qemu-devel@nongnu.org; Wed, 19 Jan 2022 12:18:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-187-pKRSC75wN_WfUK6G23j3Cg-1; Wed, 19 Jan 2022 12:18:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A3E9783DD23; Wed, 19 Jan 2022 17:18:06 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.80]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 65E467EFFE; Wed, 19 Jan 2022 17:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642612693; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gjx5zBh2uSL8StsrRpbf84OR1jSjECyM3mgKt8sFMvA=; b=Y+2iozWXALEWZ4dYSd5P0malC3qMOi0o8AJV80j4HyTO2eADHyjNI2vaIJGq/lEPhivwB5 ntdDgcCtZB5wRiHE2ffDpVa09KsnxulnwVuy26QPo2QuSypqbuAKKZGoiwYySu0YPWQCC5 2O1yMvxblNppSJeqTuYbIjOzz2Deg6E= X-MC-Unique: pKRSC75wN_WfUK6G23j3Cg-1 From: Andrea Bolognani To: qemu-devel@nongnu.org Subject: [PATCH 2/3] meson: Don't pass 'method' to dependency() Date: Wed, 19 Jan 2022 18:17:59 +0100 Message-Id: <20220119171800.491703-3-abologna@redhat.com> In-Reply-To: <20220119171800.491703-1-abologna@redhat.com> References: <20220119171800.491703-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=abologna@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=abologna@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1642613180166100001 Content-Type: text/plain; charset="utf-8" Meson will do the right thing by default. Signed-off-by: Andrea Bolognani --- meson.build | 74 ++++++++++++++++++++----------------------------- tcg/meson.build | 2 +- 2 files changed, 31 insertions(+), 45 deletions(-) diff --git a/meson.build b/meson.build index bc17ba67fd..b807ad9fbb 100644 --- a/meson.build +++ b/meson.build @@ -427,13 +427,13 @@ if 'CONFIG_GIO' in config_host endif lttng =3D not_found if 'ust' in get_option('trace_backends') - lttng =3D dependency('lttng-ust', required: true, method: 'pkg-config', + lttng =3D dependency('lttng-ust', required: true, kwargs: static_kwargs) 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) + kwargs: static_kwargs) endif zlib =3D dependency('zlib', required: true, kwargs: static_kwargs) =20 @@ -446,18 +446,18 @@ endif linux_io_uring =3D not_found if not get_option('linux_io_uring').auto() or have_block linux_io_uring =3D dependency('liburing', required: get_option('linux_io= _uring'), - method: 'pkg-config', kwargs: static_kwargs) + kwargs: static_kwargs) endif libxml2 =3D not_found if not get_option('libxml2').auto() or have_block libxml2 =3D dependency('libxml-2.0', required: get_option('libxml2'), - method: 'pkg-config', kwargs: static_kwargs) + kwargs: static_kwargs) endif 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) + kwargs: static_kwargs) endif =20 libattr_test =3D ''' @@ -505,7 +505,7 @@ seccomp =3D not_found 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) + kwargs: static_kwargs) endif =20 libcap_ng =3D not_found @@ -533,7 +533,7 @@ if get_option('xkbcommon').auto() and not have_system a= nd not have_tools xkbcommon =3D not_found else xkbcommon =3D dependency('xkbcommon', required: get_option('xkbcommon'), - method: 'pkg-config', kwargs: static_kwargs) + kwargs: static_kwargs) endif =20 vde =3D not_found @@ -562,30 +562,30 @@ 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) + kwargs: static_kwargs) 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) + kwargs: static_kwargs) 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) + kwargs: static_kwargs) 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.12.3', required: get_option('spice_protocol'), - method: 'pkg-config', kwargs: static_kwargs) + kwargs: static_kwargs) endif spice =3D not_found if not get_option('spice').auto() or have_system spice =3D dependency('spice-server', version: '>=3D0.12.5', required: get_option('spice'), - method: 'pkg-config', kwargs: static_kwargs) + kwargs: static_kwargs) endif spice_headers =3D spice.partial_dependency(compile_args: true, includes: t= rue) =20 @@ -595,32 +595,29 @@ 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) + kwargs: static_kwargs) 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) + kwargs: static_kwargs) endif virgl =3D not_found if not get_option('virglrenderer').auto() or have_system virgl =3D dependency('virglrenderer', - method: 'pkg-config', required: get_option('virglrenderer'), kwargs: static_kwargs) 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) 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) endif @@ -720,7 +717,6 @@ if have_system and not get_option('curses').disabled() if not curses.found() curses =3D dependency(curses_dep, required: false, - method: 'pkg-config', kwargs: static_kwargs) endif endforeach @@ -821,7 +817,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) + kwargs: static_kwargs) else if get_option('sdl_image').enabled() error('sdl-image required, but SDL was @0@'.format( @@ -864,7 +860,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) + kwargs: static_kwargs) if glusterfs.found() glusterfs_ftruncate_has_stat =3D cc.links(''' #include @@ -898,7 +894,6 @@ endif 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) endif @@ -980,7 +975,7 @@ if 'CONFIG_OPENGL' in config_host 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, + gbm =3D dependency('gbm', required: false, kwargs: static_kwargs) endif =20 @@ -1001,7 +996,6 @@ if get_option('gnutls').enabled() or (get_option('gnut= ls').auto() and have_syste # still use a different crypto backend to satisfy # the platform support requirements gnutls_crypto =3D dependency('gnutls', version: '>=3D3.6.14', - method: 'pkg-config', required: false, kwargs: static_kwargs) if gnutls_crypto.found() @@ -1009,7 +1003,6 @@ if get_option('gnutls').enabled() or (get_option('gnu= tls').auto() and have_syste 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) endif @@ -1049,7 +1042,6 @@ if not gnutls_crypto.found() 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) if nettle.found() and not cc.has_header('nettle/xts.h', dependencies: = nettle) @@ -1063,19 +1055,16 @@ gtkx11 =3D not_found vte =3D not_found if not get_option('gtk').auto() or (have_system and not cocoa.found()) gtk =3D dependency('gtk+-3.0', version: '>=3D3.22.0', - method: 'pkg-config', required: get_option('gtk'), kwargs: static_kwargs) if gtk.found() gtkx11 =3D dependency('gtk+-x11-3.0', version: '>=3D3.22.0', - method: 'pkg-config', required: false, kwargs: static_kwargs) 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) endif @@ -1084,7 +1073,7 @@ endif =20 x11 =3D not_found if gtkx11.found() - x11 =3D dependency('x11', method: 'pkg-config', required: gtkx11.found(), + x11 =3D dependency('x11', required: gtkx11.found(), kwargs: static_kwargs) endif vnc =3D not_found @@ -1094,9 +1083,9 @@ sasl =3D not_found if have_system and not get_option('vnc').disabled() vnc =3D declare_dependency() # dummy dependency png =3D dependency('libpng', required: get_option('vnc_png'), - method: 'pkg-config', kwargs: static_kwargs) + kwargs: static_kwargs) jpeg =3D dependency('libjpeg', required: get_option('vnc_jpeg'), - method: 'pkg-config', kwargs: static_kwargs) + kwargs: static_kwargs) sasl =3D cc.find_library('sasl2', has_headers: ['sasl/sasl.h'], required: get_option('vnc_sasl'), kwargs: static_kwargs) @@ -1181,54 +1170,52 @@ endif 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', + version: '>=3D2.5.1', kwargs: static_kwargs) endif u2f =3D not_found if have_system u2f =3D dependency('u2f-emu', required: get_option('u2f'), - method: 'pkg-config', kwargs: static_kwargs) 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', + version: '>=3D0.6', kwargs: static_kwargs) 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', + version: '>=3D1.0.13', kwargs: static_kwargs) 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) + kwargs: static_kwargs) 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', + version: '>=3D57', kwargs: static_kwargs) endif tasn1 =3D not_found if gnutls.found() tasn1 =3D dependency('libtasn1', - method: 'pkg-config', kwargs: static_kwargs) endif keyutils =3D dependency('libkeyutils', required: false, - method: 'pkg-config', kwargs: static_kwargs) + kwargs: static_kwargs) =20 has_gettid =3D cc.has_function('gettid') =20 # libselinux selinux =3D dependency('libselinux', required: get_option('selinux'), - method: 'pkg-config', kwargs: static_kwargs) + kwargs: static_kwargs) =20 # Malloc tests =20 @@ -1286,7 +1273,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', + version: '>=3D3.1', kwargs: static_kwargs) =20 fuse_lseek =3D not_found @@ -1304,7 +1291,7 @@ if not get_option('fuse_lseek').disabled() endif =20 # libbpf -libbpf =3D dependency('libbpf', required: get_option('bpf'), method: 'pkg-= config') +libbpf =3D dependency('libbpf', required: get_option('bpf')) if libbpf.found() and not cc.links(''' #include int main(void) @@ -2053,7 +2040,7 @@ capstone_opt =3D get_option('capstone') if capstone_opt in ['enabled', 'auto', 'system'] have_internal =3D fs.exists(meson.current_source_dir() / 'capstone/Makef= ile') capstone =3D dependency('capstone', version: '>=3D4.0', - kwargs: static_kwargs, method: 'pkg-config', + kwargs: static_kwargs, required: capstone_opt =3D=3D 'system' or capstone_opt =3D=3D 'enabled' and not ha= ve_internal) =20 @@ -2177,7 +2164,6 @@ if have_system if slirp_opt in ['enabled', 'auto', 'system'] have_internal =3D fs.exists(meson.current_source_dir() / 'slirp/meson.= build') slirp =3D dependency('slirp', kwargs: static_kwargs, - method: 'pkg-config', required: slirp_opt =3D=3D 'system' or slirp_opt =3D=3D 'enabled' and not have_i= nternal) if slirp.found() diff --git a/tcg/meson.build b/tcg/meson.build index c4c63b19d4..26a46269db 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) + kwargs: static_kwargs) specific_ss.add(libffi) specific_ss.add(files('tci.c')) endif --=20 2.34.1 From nobody Mon Apr 29 11:04:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164261389520635.42980963766422; Wed, 19 Jan 2022 09:38:15 -0800 (PST) Received: from localhost ([::1]:47356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAEuT-0001WN-Mz for importer@patchew.org; Wed, 19 Jan 2022 12:38:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAEbM-0002AU-R3 for qemu-devel@nongnu.org; Wed, 19 Jan 2022 12:18:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:50037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAEbJ-00005q-SK for qemu-devel@nongnu.org; Wed, 19 Jan 2022 12:18:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-493-mTsQGcb-OzGbdxF9Ce-X7g-1; Wed, 19 Jan 2022 12:18:08 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC0311966344; Wed, 19 Jan 2022 17:18:07 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.80]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ED6937FB81; Wed, 19 Jan 2022 17:18:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642612697; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7l/MlW5h+269fCKwd8O0xPoycG7T0KEOnVoEzrKNGwM=; b=dHtpES4mdGDlKfyNFUAIOHmm3N7LaV+S5bX4NVbpVVYkhNWDKLMYLvds4oBpYIKTC3OlKS v7QEIW22QswaWf98tW/3tZMFvRGrLh7RAKKTrIrwBukcUL4CISKkE/nO4emycQRqxQjhIj qGvY7C/Tnp7tFDqoMG1PGMgX8AzrjpI= X-MC-Unique: mTsQGcb-OzGbdxF9Ce-X7g-1 From: Andrea Bolognani To: qemu-devel@nongnu.org Subject: [PATCH 3/3] docs: Don't recommend passing 'method' to dependency() Date: Wed, 19 Jan 2022 18:18:00 +0100 Message-Id: <20220119171800.491703-4-abologna@redhat.com> In-Reply-To: <20220119171800.491703-1-abologna@redhat.com> References: <20220119171800.491703-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=abologna@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=abologna@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1642613896192100001 Content-Type: text/plain; charset="utf-8" Meson will do the right thing by default. Signed-off-by: Andrea Bolognani --- docs/devel/build-system.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 431caba7aa..fcdc0cd187 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -316,7 +316,6 @@ dependency will be used:: sdl_image =3D not_found if not get_option('sdl_image').auto() or have_system sdl_image =3D dependency('SDL2_image', required: get_option('sdl_image= '), - method: 'pkg-config', static: enable_static) endif =20 --=20 2.34.1