From nobody Tue Feb 10 05:41:32 2026 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=1598982027; cv=none; d=zohomail.com; s=zohoarc; b=LnKHIXi0BTzWjK+TI5gZqYTutavdAjpbgxJ2usu5v9fgPeZ2ONeWbMhzvu7pKAMj9TPMO4qU8lemyn5dxwFWj1vRUj/B0iH0aZABEAZ/wO41YAMSpGiUSwtGnDp+BwagcddvW7WjIdLQJKvQbJiTwmuB0+5sebrf1ypy8MIzBOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598982027; 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=51HqoL+LjJp9NyQT7ozA0nKZONJYWfYVaT6ANkPD0mc=; b=keDaeCt4NUy+T5H4+gUrdVwM6e+7YyuAIyVkdjS8rFvgZhDa0dmIaDsRn0cLm3gbh8OtmilSEO3bLzuXH4oW2DWDAvmnxmLvLKhjRtVsYauXRLWO7SLTrAK2XCJ5EspTL1GWUlKtxc+ekV+75u/AyV/BY+nOZaMlZOU49AN+c60= 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 1598982027275671.3164101682017; Tue, 1 Sep 2020 10:40:27 -0700 (PDT) Received: from localhost ([::1]:33106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDAGe-0004oX-NN for importer@patchew.org; Tue, 01 Sep 2020 13:40:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDAFA-0003aq-WC for qemu-devel@nongnu.org; Tue, 01 Sep 2020 13:38:53 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44103 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDAF8-00017M-Ux for qemu-devel@nongnu.org; Tue, 01 Sep 2020 13:38:52 -0400 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-2-X9_bU1UEMMitY_j1XgnAPA-1; Tue, 01 Sep 2020 13:38:47 -0400 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 A696818A224D for ; Tue, 1 Sep 2020 17:38:46 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9171051C4F; Tue, 1 Sep 2020 17:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598981929; 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=51HqoL+LjJp9NyQT7ozA0nKZONJYWfYVaT6ANkPD0mc=; b=Pv2Y8X3HF6FQw1AZXKdVazymYL9nRiulyBMJL6dz0G2YbB0/1NqiQoOWDjDS3qPWWAYkhS 0UJbISc2vkvU4UaMVcujfy6yT5IHTfTjGvjTP4c0N+2qbKc+F89pIBtbYRDKetS5FOF4rR HmIkHKF74ZUt5NvG3TWOJCsRRZoO+RE= X-MC-Unique: X9_bU1UEMMitY_j1XgnAPA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/26] meson: move zlib detection to meson Date: Tue, 1 Sep 2020 13:38:39 -0400 Message-Id: <20200901173842.5882-2-pbonzini@redhat.com> In-Reply-To: <20200901173842.5882-1-pbonzini@redhat.com> References: <20200901173842.5882-1-pbonzini@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=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 05:11:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H2=-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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Meson includes the same logic that tries to look for -lz if pkg-config (and cmake) cannot find zlib. The undocumented --disable-zlib-test option becomes a no-op. There is still an instance of "-lz" in the LIBS directory. It will go away as soon as tests are converted to meson, because the zlib dependency does not propagate from libblock.fa to the Makefile-build unit tests. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 32 +------------------------------- meson.build | 6 +----- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/configure b/configure index f81900880a..e8946aeefb 100755 --- a/configure +++ b/configure @@ -502,7 +502,6 @@ opengl=3D"" opengl_dmabuf=3D"no" cpuid_h=3D"no" avx2_opt=3D"" -zlib=3D"yes" capstone=3D"" lzo=3D"" snappy=3D"" @@ -1428,7 +1427,7 @@ for opt do ;; --enable-usb-redir) usb_redir=3D"yes" ;; - --disable-zlib-test) zlib=3D"no" + --disable-zlib-test) ;; --disable-lzo) lzo=3D"no" ;; @@ -3904,30 +3903,6 @@ if ! compile_prog "$glib_cflags -Werror" "$glib_libs= " ; then fi fi =20 -######################################### -# zlib check - -if test "$zlib" !=3D "no" ; then - if $pkg_config --exists zlib; then - zlib_cflags=3D$($pkg_config --cflags zlib) - zlib_libs=3D$($pkg_config --libs zlib) - QEMU_CFLAGS=3D"$zlib_cflags $QEMU_CFLAGS" - LIBS=3D"$zlib_libs $LIBS" - else - cat > $TMPC << EOF -#include -int main(void) { zlibVersion(); return 0; } -EOF - if compile_prog "" "-lz" ; then - zlib_libs=3D-lz - LIBS=3D"$LIBS $zlib_libs" - else - error_exit "zlib check failed" \ - "Make sure to have the zlib libs and headers installed." - fi - fi -fi - ########################################## # SHA command probe for modules if test "$modules" =3D yes; then @@ -7135,11 +7110,6 @@ fi if test "$posix_memalign" =3D "yes" ; then echo "CONFIG_POSIX_MEMALIGN=3Dy" >> $config_host_mak fi -if test "$zlib" !=3D "no" ; then - echo "CONFIG_ZLIB=3Dy" >> $config_host_mak - echo "ZLIB_CFLAGS=3D$zlib_cflags" >> $config_host_mak - echo "ZLIB_LIBS=3D$zlib_libs" >> $config_host_mak -fi if test "$spice" =3D "yes" ; then echo "CONFIG_SPICE=3Dy" >> $config_host_mak echo "SPICE_CFLAGS=3D$spice_cflags" >> $config_host_mak diff --git a/meson.build b/meson.build index 6b2fc76933..b68e1bdfc7 100644 --- a/meson.build +++ b/meson.build @@ -134,11 +134,7 @@ if 'CONFIG_AUTH_PAM' in config_host pam =3D cc.find_library('pam') endif libaio =3D cc.find_library('aio', required: false) -zlib =3D not_found -if 'CONFIG_ZLIB' in config_host - zlib =3D declare_dependency(compile_args: config_host['ZLIB_CFLAGS'].spl= it(), - link_args: config_host['ZLIB_LIBS'].split()) -endif +zlib =3D dependency('zlib', required: true, static: enable_static) linux_io_uring =3D not_found if 'CONFIG_LINUX_IO_URING' in config_host linux_io_uring =3D declare_dependency(compile_args: config_host['LINUX_I= O_URING_CFLAGS'].split(), --=20 2.26.2