From nobody Tue Feb 10 13:34:23 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 ARC-Seal: i=1; a=rsa-sha256; t=1623151992; cv=none; d=zohomail.com; s=zohoarc; b=kp9rweVy6uPAAEuerNzJLGwVu+AKA1/Aasl4dMp3tu94O+WeqKVc7rXeCQ7M7DE/Fila3LarR8LDIJiK7r5VFwbN+uSSF70I6qBVEzqSLK+xXCJFtcCXFwqBA+3JKqs3JGKIKI/p4lInfGVoCdMPVGHkAwX9u1UKVimIpVhKOfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623151992; h=Content-Transfer-Encoding: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=LZLODOBcrmhrnrdjLeC81KpnKgMjP8hJ8DsNQAfM7Xg=; b=dC7P7LAip7zznFfr+7WpU2WNJDevBteiP9shHDkxFzPu2rlKz3GlgxqV0hWddpsqxQknRa+ITHaoambwKjSGZqXeZpXV2szutGjqEQrmc/3xQ7Se0tsg9LVh7lhOQUS0555dPZERrXM4a2hwAo2vPhaN6T0FQGlxLnSMCRQEnxI= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623151992755171.78744394347245; Tue, 8 Jun 2021 04:33:12 -0700 (PDT) Received: from localhost ([::1]:59950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqZyp-0000pW-Lm for importer@patchew.org; Tue, 08 Jun 2021 07:33:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqZpD-0006Xt-JV for qemu-devel@nongnu.org; Tue, 08 Jun 2021 07:23:15 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:53960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqZpC-00080l-15 for qemu-devel@nongnu.org; Tue, 08 Jun 2021 07:23:15 -0400 Received: by mail-wm1-x329.google.com with SMTP id h3so1588625wmq.3 for ; Tue, 08 Jun 2021 04:23:13 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id i9sm15388621wrn.54.2021.06.08.04.23.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 04:23:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LZLODOBcrmhrnrdjLeC81KpnKgMjP8hJ8DsNQAfM7Xg=; b=ENwMr/JxFL/3Xe7LCyLif39qmnb3m+TA5LEF2Uf9NQ6oqLZVDv0A+kaLQl/7qU6up2 VZZMZphaS3B6w/pYvgf2s1jkXjiD4PP+qVbcOv3dY9qgwAiRwj8twktQtmWfswcg0YJg qhg2BOPkKkcizLIOS5o8qH1KI+PE1hcxSjJuU/LCxEFyxpTLLIGbBbOkc/QjZEe35996 cj81Gaa4Vu/umt6ngPMUncdLakV17OmlA9rW13Ih3JsdOOJJdsBPOb/+9BwLyvwAPaBR 2dbKJu7/pByQZ41NDyUspwG6WP5P/AICNKRYf2TEssQvgreVOeaU8rzmhKaY+kzwKiGt 86Bw== 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:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LZLODOBcrmhrnrdjLeC81KpnKgMjP8hJ8DsNQAfM7Xg=; b=GMatydq44Deh9ev46rv2D4PP0VFkRdwkAcMUfpnK/2yxJ7GLAW+jzxzo4R4Z1IyCai Hazp5AVJ7b12IKmAuBPwvgs0wHcpWgYOAAxx5cMcOl87hL5x1/HqH2gCkJZJtKYKLo9D 6kGU8nL/foqEnyqrdwcovedBFegBkaqH7PkgASeH83vH/88WQBQGSLQMq13P0p6wEyBv E6i6KLEXe3quqtLDszfDun2QTbXSg4SJyuNC5PxYnb8B/sH36QpiEpId/GKF+yp+5pad xmkGP4kDzqrugDxgp4/FbtwGSd/zaTPpbSNfpZdHwJGQ+LBe9BlYY+YYMxn+MHvIAYl8 IPUw== X-Gm-Message-State: AOAM5332PdudbCHHISjUFhdVJBvIe3l55DOyza5OY0WWU/Ig511/gNw3 7Kp0maziX+diu67oXBPmqCdlSuFznLr7cQ== X-Google-Smtp-Source: ABdhPJxeY1UWWubYc7eXZXFiovCRbCsOqsav+hL++TY3weUz2wAvyvRSW7aGDs9fo0Z1wPFKjJUmdw== X-Received: by 2002:a05:600c:3b11:: with SMTP id m17mr21620278wms.150.1623151392881; Tue, 08 Jun 2021 04:23:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 11/26] configure, meson: convert libdaxctl detection to meson Date: Tue, 8 Jun 2021 13:22:46 +0200 Message-Id: <20210608112301.402434-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210608112301.402434-1-pbonzini@redhat.com> References: <20210608112301.402434-1-pbonzini@redhat.com> MIME-Version: 1.0 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::329; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x329.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 c2c8c9f2d6..bd675f2254 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" ;; @@ -4950,22 +4950,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 @@ -5737,11 +5721,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 @@ -6107,6 +6086,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 842831e1fb..f1ece39736 100644 --- a/meson.build +++ b/meson.build @@ -1016,8 +1016,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() @@ -2835,7 +2837,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