From nobody Tue Feb 10 04:16:42 2026 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 1625566607632512.4836608130895; Tue, 6 Jul 2021 03:16:47 -0700 (PDT) Received: from localhost ([::1]:43598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0i8E-0000dc-FP for importer@patchew.org; Tue, 06 Jul 2021 06:16:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0htv-0000yR-Ey for qemu-devel@nongnu.org; Tue, 06 Jul 2021 06:01:59 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:37487) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0hts-0002KU-F8 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 06:01:59 -0400 Received: by mail-wm1-x32a.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so1280768wmh.2 for ; Tue, 06 Jul 2021 03:01:56 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v15sm2331268wmj.39.2021.07.06.03.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 03:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/MVRv4+jx3llq16RDcVRAyicy4Ay5QfckD+dpn3sjS4=; b=Zl7pNb8Fjo13bdt+8VyfXU+w54TGNe1wex2TfADC82PhaxuqVIEgZyko28gAWvY2z9 din7f0v6i59sQpF/CX23R+0rOEsM2hw8hCPEfuB87op+ikqMX0NuS2DYYZo5UJHpECHm TPwmDpKDs2/KtNPJ01+vUjTmIIe06YKbwqFJbhypp/Bfzu/98EZ6k/eVmiLGGhaUlXga 2quBnmOrlFAeMYlzhtTkao+DubmqbFItMjReFZWOOwg9a9Hh8Y3F7ZFHfdOqxiDPJBe/ fpXAWEWSPZTrdwHeOBtdeNI8B0zhW3weAZBN2+X7GKgAQy+NNqmCrUeuWyFKfkZnYI5R lPUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/MVRv4+jx3llq16RDcVRAyicy4Ay5QfckD+dpn3sjS4=; b=gh5yX+nhkSuEY1JJjrcl67QzvBc8Uhc2ecZWmWLZ8UkqCIBlaVHVutnEUK1wcug1Vp d7C0EOuqJaCHzaZeEw9rnjDhywNcda3w1MthTRTYkXq2yF2iox7OPUZwt8SzR7Gqbg4k Fey/NqJf2aH3KplihSo8QJ9/DSScVQU95tRDnvJN8lFOOUWOaKXgo8+8F6pRTKykE746 2/7rNuduHXrsiFvI7MnRiZr8w5fQQrwaF7aXc6NnFnsraDSM5JZkuMVQODshsliENNWT DHeBHBRCXDszoKOMS822SBIn8wbSQBRT0dG0XmhyAn1w4LD/+XJ1jMHzECiE9V4Kh3z+ yCGg== X-Gm-Message-State: AOAM531mI8vDPZXLOkfkvO2bLEPaf5aYkrEqxBAVPlpSEWm2itEF7onc azA45O/YNUrRVXvcH9gUSsGhDTwkiYk= X-Google-Smtp-Source: ABdhPJx2+QOFwpdIm0t0OgR3JQwe7c52LY5YaC4hhZOOmi7VHSokArobXBYe2tI1hu6JAW3JD9FTKA== X-Received: by 2002:a05:600c:3b0b:: with SMTP id m11mr19781086wms.162.1625565715152; Tue, 06 Jul 2021 03:01:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/40] configure, meson: convert libdaxctl detection to meson Date: Tue, 6 Jul 2021 12:01:20 +0200 Message-Id: <20210706100141.303960-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210706100141.303960-1-pbonzini@redhat.com> References: <20210706100141.303960-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::32a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=20=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: 1625566615295100001 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 28 ++++------------------------ meson.build | 8 +++++--- meson_options.txt | 2 ++ 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/configure b/configure index 895192e0de..5b18f4fac3 100755 --- a/configure +++ b/configure @@ -433,7 +433,7 @@ plugins=3D"no" fuzzing=3D"no" rng_none=3D"no" secret_keyring=3D"$default_feature" -libdaxctl=3D"$default_feature" +libdaxctl=3D"auto" meson=3D"" ninja=3D"" skip_meson=3Dno @@ -1534,9 +1534,9 @@ for opt do ;; --disable-keyring) secret_keyring=3D"no" ;; - --enable-libdaxctl) libdaxctl=3Dyes + --enable-libdaxctl) libdaxctl=3Ddisabled ;; - --disable-libdaxctl) libdaxctl=3Dno + --disable-libdaxctl) libdaxctl=3Denabled ;; --enable-fuse) fuse=3D"enabled" ;; @@ -4949,22 +4949,6 @@ if test "$libpmem" !=3D "no"; then fi fi =20 -########################################## -# check for libdaxctl - -if test "$libdaxctl" !=3D "no"; then - if $pkg_config --atleast-version=3D57 "libdaxctl"; then - libdaxctl=3D"yes" - libdaxctl_libs=3D$($pkg_config --libs libdaxctl) - libdaxctl_cflags=3D$($pkg_config --cflags libdaxctl) - else - if test "$libdaxctl" =3D "yes" ; then - feature_not_found "libdaxctl" "Install libdaxctl" - fi - libdaxctl=3D"no" - fi -fi - ########################################## # check for slirp =20 @@ -5738,11 +5722,6 @@ if test "$libpmem" =3D "yes" ; then echo "LIBPMEM_CFLAGS=3D$libpmem_cflags" >> $config_host_mak fi =20 -if test "$libdaxctl" =3D "yes" ; then - echo "CONFIG_LIBDAXCTL=3Dy" >> $config_host_mak - echo "LIBDAXCTL_LIBS=3D$libdaxctl_libs" >> $config_host_mak -fi - if test "$bochs" =3D "yes" ; then echo "CONFIG_BOCHS=3Dy" >> $config_host_mak fi @@ -6108,6 +6087,7 @@ if test "$skip_meson" =3D no; then -Dcurl=3D$curl -Dglusterfs=3D$glusterfs -Dbzip2=3D$bzip2 -Dlibiscs= i=3D$libiscsi \ -Dlibnfs=3D$libnfs -Diconv=3D$iconv -Dcurses=3D$curses -Dlibudev= =3D$libudev\ -Drbd=3D$rbd -Dlzo=3D$lzo -Dsnappy=3D$snappy -Dlzfse=3D$lzfse \ + -Dlibdaxctl=3D$libdaxctl \ -Dgnutls=3D$gnutls -Dnettle=3D$nettle -Dgcrypt=3D$gcrypt -Dauth_pa= m=3D$auth_pam \ -Dzstd=3D$zstd -Dseccomp=3D$seccomp -Dvirtfs=3D$virtfs -Dcap_ng=3D= $cap_ng \ -Dattr=3D$attr -Ddefault_devices=3D$default_devices -Dvirglrendere= r=3D$virglrenderer \ diff --git a/meson.build b/meson.build index 84ffdb4599..e530829105 100644 --- a/meson.build +++ b/meson.build @@ -1011,8 +1011,10 @@ if 'CONFIG_LIBPMEM' in config_host link_args: config_host['LIBPMEM_LIBS'].spli= t()) endif libdaxctl =3D not_found -if 'CONFIG_LIBDAXCTL' in config_host - libdaxctl =3D declare_dependency(link_args: config_host['LIBDAXCTL_LIBS'= ].split()) +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) endif tasn1 =3D not_found if gnutls.found() @@ -2821,7 +2823,7 @@ summary_info +=3D {'NUMA host support': config_host.h= as_key('CONFIG_NUMA')} summary_info +=3D {'libxml2': config_host.has_key('CONFIG_LIBXML= 2')} summary_info +=3D {'capstone': capstone_opt =3D=3D 'disabled' ? f= alse : capstone_opt} summary_info +=3D {'libpmem support': config_host.has_key('CONFIG_LIBPME= M')} -summary_info +=3D {'libdaxctl support': config_host.has_key('CONFIG_LIBDAX= CTL')} +summary_info +=3D {'libdaxctl support': libdaxctl.found()} summary_info +=3D {'libudev': libudev.found()} summary_info +=3D {'FUSE lseek': fuse_lseek.found()} summary(summary_info, bool_yn: true, section: 'Dependencies') diff --git a/meson_options.txt b/meson_options.txt index a70aedb0eb..46180000fd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -84,6 +84,8 @@ option('nettle', type : 'feature', value : 'auto', description: 'nettle cryptography support') option('gcrypt', type : 'feature', value : 'auto', description: 'libgcrypt cryptography support') +option('libdaxctl', type : 'feature', value : 'auto', + description: 'libdaxctl support') option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') option('libusb', type : 'feature', value : 'auto', --=20 2.31.1