From nobody Tue Nov 18 09:20:11 2025 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=1608569308; cv=none; d=zohomail.com; s=zohoarc; b=Y+hZxOH3oap9rd2PCvHBfsuIxpi78Alj8khASAtwMJlE1KNgx50yUHl/M5+MhDNqX49nUvFIEJCQxz3NcKblelLgEoT4c1P6Q2oE2OVWI/AbCm4nc168IurgvZ6p6+y7ycjZ67iPqSUgEFmJHNTe1ECnKgqr1rZSoBCPDAFUsZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608569308; 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=YskNFeL4B91Ml00lS/fJmS33X5P96iW79FRphupRrWk=; b=ifjhc5tuL7obdQcJdknE5MgAg9UCyTQULgGqZWSU3FlChIEIpZjxSivseyU7Zq+9A2t2NeJRpwqieb2IUXwtg4AqIqPu0T0gbAXfqtx0whAGaVrMSYW5UCN4lkGilHRY7Wz/+3ScRFdnGXGgtY8SIb6fYJ9P2HO+1C5kSE+HbAI= 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 1608569308064783.2738440431804; Mon, 21 Dec 2020 08:48:28 -0800 (PST) Received: from localhost ([::1]:48540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krMo0-0008NX-EG for importer@patchew.org; Mon, 21 Dec 2020 10:09:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krMRL-00051a-JT for qemu-devel@nongnu.org; Mon, 21 Dec 2020 09:45:35 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:55818) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1krMRG-0007un-Eq for qemu-devel@nongnu.org; Mon, 21 Dec 2020 09:45:35 -0500 Received: by mail-wm1-x32f.google.com with SMTP id x22so10081356wmc.5 for ; Mon, 21 Dec 2020 06:45:29 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id l5sm27439627wrv.44.2020.12.21.06.45.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Dec 2020 06:45:28 -0800 (PST) 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=YskNFeL4B91Ml00lS/fJmS33X5P96iW79FRphupRrWk=; b=e4F89QkCH5JhwsUUpgBMJfGYyi93dPK6F+HtN0EZ2+jdgQtCHJba0b2FLa/Urg8hAL NX060dtRtph0s38aSktq8nz9EfxKGaKZrKo3Mz2kRs9ttTFzYckvZRYrufOe+qtXsEyV fsHzZmTqCwcVj/J/NExz2kGpbp1iAlfUPoKeFKUPYIUZzx+QcDXLpyxnk1gfXYW7ZKB1 94D8nXT/2W69LlEK9EkBxlkRoTNb7FsVsU2qRbOyE+UbDoKiyBRN66UQ03dPnOykrvgC MtBs0+RbhVTFARY9I7uZiny2lFOADn9R1uunHg+RkE6aJoJz81BrydRQxbsdb2OlKO7L DidA== 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=YskNFeL4B91Ml00lS/fJmS33X5P96iW79FRphupRrWk=; b=pd9irSSc8R1Ahdc0KZ2kfzxol8FYfGaIV/N8YFY+rTwI9JTewbPJb3+jPgBdJP22Py tZedGrJ7zTDsRDfUSAajsE/3u6wWVSjax6ek0MeU8TpfOwOUOBLpl3uvfC0VQDyyvugz DKpRdNl2phyipjKJt4WSS5VqSFA7bPs53pNRxtPumrQoLqLobelXyoht8dUFjLAa/4gC inBlAk80uzguop6TNkEgBSWTA/isPfyvy6Bk3llwkDNVbWmw0kUm5w2gLBxK9Qtm4pAB K3gajjMHxeIHxgKy9fsmkK1NaOU61XwuA2DDphgswYRTRrmQiARld87cNHg7qTwHcjvM Ducg== X-Gm-Message-State: AOAM5307ivRAkOB0/TvLbP+sQwcnh4kK+XwuzH57TNS/ru2NvGXBqcGB FPCnl6LH1PrkFT7Ce5BvBDVqv1O0BkU= X-Google-Smtp-Source: ABdhPJz6MgGCl61CnBw4jOKNRiHCkxfrfuFMSwnrj3TTzFmbdPiiDZkCAsuoIdpHDViO7cv8Vyf5gA== X-Received: by 2002:a05:600c:2188:: with SMTP id e8mr17076993wme.99.1608561929161; Mon, 21 Dec 2020 06:45:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 45/55] lzo: convert to meson Date: Mon, 21 Dec 2020 15:44:37 +0100 Message-Id: <20201221144447.26161-46-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201221144447.26161-1-pbonzini@redhat.com> References: <20201221144447.26161-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::32f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32f.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.25, 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 | 32 ++++---------------------------- meson.build | 20 ++++++++++++++++---- meson_options.txt | 2 ++ 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/configure b/configure index a2e4796053..1574ea8456 100755 --- a/configure +++ b/configure @@ -393,7 +393,7 @@ opengl_dmabuf=3D"no" cpuid_h=3D"no" avx2_opt=3D"$default_feature" capstone=3D"auto" -lzo=3D"$default_feature" +lzo=3D"auto" snappy=3D"$default_feature" bzip2=3D"auto" lzfse=3D"$default_feature" @@ -1311,9 +1311,9 @@ for opt do ;; --disable-zlib-test) ;; - --disable-lzo) lzo=3D"no" + --disable-lzo) lzo=3D"disabled" ;; - --enable-lzo) lzo=3D"yes" + --enable-lzo) lzo=3D"enabled" ;; --disable-snappy) snappy=3D"no" ;; @@ -2456,25 +2456,6 @@ EOF fi fi =20 -########################################## -# lzo check - -if test "$lzo" !=3D "no" ; then - cat > $TMPC << EOF -#include -int main(void) { lzo_version(); return 0; } -EOF - if compile_prog "" "-llzo2" ; then - lzo_libs=3D"-llzo2" - lzo=3D"yes" - else - if test "$lzo" =3D "yes"; then - feature_not_found "liblzo2" "Install liblzo2 devel" - fi - lzo=3D"no" - fi -fi - ########################################## # snappy check =20 @@ -6124,11 +6105,6 @@ if test "$avx512f_opt" =3D "yes" ; then echo "CONFIG_AVX512F_OPT=3Dy" >> $config_host_mak fi =20 -if test "$lzo" =3D "yes" ; then - echo "CONFIG_LZO=3Dy" >> $config_host_mak - echo "LZO_LIBS=3D$lzo_libs" >> $config_host_mak -fi - if test "$snappy" =3D "yes" ; then echo "CONFIG_SNAPPY=3Dy" >> $config_host_mak echo "SNAPPY_LIBS=3D$snappy_libs" >> $config_host_mak @@ -6697,7 +6673,7 @@ NINJA=3D$ninja $meson setup \ -Dcapstone=3D$capstone -Dslirp=3D$slirp -Dfdt=3D$fdt -Dbrlapi=3D$b= rlapi \ -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\ - -Dlibssh=3D$libssh -Drbd=3D$rbd \ + -Dlibssh=3D$libssh -Drbd=3D$rbd -Dlzo=3D$lzo \ -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 -Dfuse_lseek=3D$fuse_lseek \ diff --git a/meson.build b/meson.build index 92fe7007ef..2a2f7d0039 100644 --- a/meson.build +++ b/meson.build @@ -757,10 +757,21 @@ snappy =3D not_found if 'CONFIG_SNAPPY' in config_host snappy =3D declare_dependency(link_args: config_host['SNAPPY_LIBS'].spli= t()) endif -lzo =3D not_found -if 'CONFIG_LZO' in config_host - lzo =3D declare_dependency(link_args: config_host['LZO_LIBS'].split()) + +lzo =3D cc.find_library('lzo2', has_headers: ['lzo/lzo1x.h'], + required: get_option('lzo'), + static: enable_static) +if lzo.found() and not cc.links(''' + #include + int main(void) { lzo_version(); return 0; }''', dependencies: lzo) + lzo =3D not_found + if get_option('lzo').enabled() + error('could not link liblzo2') + else + warning('could not link liblzo2, disabling') + endif endif + rdma =3D not_found if 'CONFIG_RDMA' in config_host rdma =3D declare_dependency(link_args: config_host['RDMA_LIBS'].split()) @@ -945,6 +956,7 @@ config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_op= tion('prefix') / get_opti config_host_data.set('CONFIG_BRLAPI', brlapi.found()) config_host_data.set('CONFIG_COCOA', cocoa.found()) config_host_data.set('CONFIG_LIBUDEV', libudev.found()) +config_host_data.set('CONFIG_LZO', lzo.found()) config_host_data.set('CONFIG_MPATH', mpathpersist.found()) config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new_api) config_host_data.set('CONFIG_CURL', curl.found()) @@ -2346,7 +2358,7 @@ summary_info +=3D {'TPM support': config_host.h= as_key('CONFIG_TPM')} summary_info +=3D {'libssh support': libssh.found()} summary_info +=3D {'QOM debugging': config_host.has_key('CONFIG_QOM_CA= ST_DEBUG')} summary_info +=3D {'Live block migration': config_host.has_key('CONFIG_LIV= E_BLOCK_MIGRATION')} -summary_info +=3D {'lzo support': config_host.has_key('CONFIG_LZO')} +summary_info +=3D {'lzo support': lzo.found()} summary_info +=3D {'snappy support': config_host.has_key('CONFIG_SNAPPY= ')} summary_info +=3D {'bzip2 support': libbzip2.found()} summary_info +=3D {'lzfse support': config_host.has_key('CONFIG_LZFSE'= )} diff --git a/meson_options.txt b/meson_options.txt index 630c9dceb7..00a5ec55bd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -64,6 +64,8 @@ option('curses', type : 'feature', value : 'auto', description: 'curses UI') option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') +option('lzo', type : 'feature', value : 'auto', + description: 'lzo compression support') option('rbd', type : 'feature', value : 'auto', description: 'Ceph block device driver') option('sdl', type : 'feature', value : 'auto', --=20 2.29.2