From nobody Wed Dec 17 05:43:07 2025 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=1607712421; cv=none; d=zohomail.com; s=zohoarc; b=maVxrNuI4VyG7N6iqOYsne7AE6qGYGKcRA9/R87QaFAbQ8oBqVmolXlnG88sw8GyLuyP1yMCQ4kcCKEK89vZVdGCSwVVG6qWgEBmRNaUAopBWN5kO1V8lbMdcFNr54y9qN5joFbdVbmseFugzrQosH1UFdP7cM/+pd2vGJ7oQSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607712421; 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=FQrHeWDNrFrtuZfxFSDLYFBPwtjd1f76AM7/tNRZpeY=; b=esdhdfWuLhEd9uTDh0i1VqI+u1k2zamVpUwrrhH9r+eEtGzz2ws0LhonnCtehz+/Es/9M5Wc88AH/Vq5LfGlMCnGN8FDZEKrOVZiSYXL59jvNP756+a4X/H3jk6C3DIQjYWRaoeMMDUM+5/+MiF1ZJ/QmzAGqFvJPBlO8NyMGpg= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607712421876813.4081731450956; Fri, 11 Dec 2020 10:47:01 -0800 (PST) Received: from localhost ([::1]:52104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knm5A-0006kO-Bo for importer@patchew.org; Fri, 11 Dec 2020 12:19:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knluJ-0003Zw-8O for qemu-devel@nongnu.org; Fri, 11 Dec 2020 12:08:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knluA-00025H-HN for qemu-devel@nongnu.org; Fri, 11 Dec 2020 12:08:39 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-KwcjSYvUMnWCtythbLtJvQ-1; Fri, 11 Dec 2020 12:08:26 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5AF75100C661; Fri, 11 Dec 2020 17:08:25 +0000 (UTC) Received: from merkur.redhat.com (ovpn-114-231.ams2.redhat.com [10.36.114.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A2705D734; Fri, 11 Dec 2020 17:08:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607706508; 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=FQrHeWDNrFrtuZfxFSDLYFBPwtjd1f76AM7/tNRZpeY=; b=LE/5zKXHL9SG/H+/mI9dWIGwmE2/BTEOy5q7wHRD660yc2EaoWnLmHRJ4i7cogSESCUZSV OvYF9kES1NTjrQOYLh+ddvdaQplIQQvpFlBeaxVH8W2U8AvNH3t84es7GkJD5guywQX8B1 jhwBf9432s+7iDmq+5EykeP9dXGeu/s= X-MC-Unique: KwcjSYvUMnWCtythbLtJvQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 05/34] meson: Detect libfuse Date: Fri, 11 Dec 2020 18:07:43 +0100 Message-Id: <20201211170812.228643-6-kwolf@redhat.com> In-Reply-To: <20201211170812.228643-1-kwolf@redhat.com> References: <20201211170812.228643-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@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=216.205.24.124; envelope-from=kwolf@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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Max Reitz Signed-off-by: Max Reitz Message-Id: <20201027190600.192171-2-mreitz@redhat.com> Signed-off-by: Kevin Wolf --- meson_options.txt | 2 ++ configure | 7 +++++++ meson.build | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/meson_options.txt b/meson_options.txt index f6f64785fe..8f9f2e3df6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -66,6 +66,8 @@ option('virtiofsd', type: 'feature', value: 'auto', description: 'build virtiofs daemon (virtiofsd)') option('vhost_user_blk_server', type: 'feature', value: 'auto', description: 'build vhost-user-blk server') +option('fuse', type: 'feature', value: 'auto', + description: 'FUSE block device export') =20 option('capstone', type: 'combo', value: 'auto', choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], diff --git a/configure b/configure index 18c26e0389..b2f96c0da2 100755 --- a/configure +++ b/configure @@ -449,6 +449,7 @@ meson=3D"" ninja=3D"" skip_meson=3Dno gettext=3D"" +fuse=3D"auto" =20 bogus_os=3D"no" malloc_trim=3D"auto" @@ -1525,6 +1526,10 @@ for opt do ;; --disable-libdaxctl) libdaxctl=3Dno ;; + --enable-fuse) fuse=3D"enabled" + ;; + --disable-fuse) fuse=3D"disabled" + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" @@ -1850,6 +1855,7 @@ disabled with --disable-FEATURE, default is enabled i= f available: xkbcommon xkbcommon support rng-none dummy RNG, avoid using /dev/(u)random and getrandom() libdaxctl libdaxctl support + fuse FUSE block device export =20 NOTE: The object files are built at the place where configure is launched EOF @@ -7014,6 +7020,7 @@ NINJA=3D$ninja $meson setup \ -Diconv=3D$iconv -Dcurses=3D$curses -Dlibudev=3D$libudev\ -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build -Dinstall_blobs=3D$b= lobs \ -Dvhost_user_blk_server=3D$vhost_user_blk_server \ + -Dfuse=3D$fuse \ $cross_arg \ "$PWD" "$source_path" =20 diff --git a/meson.build b/meson.build index 9ea05ab49f..6e8ef151d8 100644 --- a/meson.build +++ b/meson.build @@ -773,6 +773,10 @@ elif get_option('vhost_user_blk_server').disabled() or= not have_system have_vhost_user_blk_server =3D false endif =20 +fuse =3D dependency('fuse3', required: get_option('fuse'), + version: '>=3D3.1', method: 'pkg-config', + static: enable_static) + ################# # config-host.h # ################# @@ -807,6 +811,7 @@ config_host_data.set('CONFIG_KEYUTILS', keyutils.found(= )) config_host_data.set('CONFIG_GETTID', has_gettid) config_host_data.set('CONFIG_MALLOC_TRIM', has_malloc_trim) config_host_data.set('CONFIG_STATX', has_statx) +config_host_data.set('CONFIG_FUSE', fuse.found()) config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version(= ))) config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('= .')[0]) config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) @@ -2208,6 +2213,7 @@ endif summary_info +=3D {'thread sanitizer': config_host.has_key('CONFIG_TSAN')} summary_info +=3D {'rng-none': config_host.has_key('CONFIG_RNG_NO= NE')} summary_info +=3D {'Linux keyring': config_host.has_key('CONFIG_SECRET= _KEYRING')} +summary_info +=3D {'FUSE exports': fuse.found()} summary(summary_info, bool_yn: true) =20 if not supported_cpus.contains(cpu) --=20 2.29.2