From nobody Sun Feb 8 12:13:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594893690; cv=none; d=zohomail.com; s=zohoarc; b=IclIipem7m0GFRveJDuC4RHm9gzYVaCbmCI+6MBb4G3rDEJpZxpEoF2SpUni2xMs2RF0/0mjhf7gip9JSDSZ9cIiaVf9h5BkA95kGiSN6VJu1bg/NX0ICRUyl5BbE93z6X9YsJ05Ez67NIkA1HDz64Bo9ATom5R1/OpRWv0Was0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893690; h=Content-Type: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=hSEa7kCM2KlbkRGsy7m0fLHcPv5I82P/jKvAJeIc/w4=; b=HtqpJVPQS0W6DzvtWC+Sd9jVykOh5owS+aPkDIk41BQlJjoGJZT5HbKNd2JVDVC9y+aUvxRGuGrnfFECB7LY15voAnKfOIqs6f3p7rVgFah124VnTPK+YxJHxwcwDpAJivSJXJQi6uxYLHk/99ZoTe8YTpzoxX7VWvur1Gx3/BA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893690097497.07263947971285; Thu, 16 Jul 2020 03:01:30 -0700 (PDT) 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-186-hH-3CBofOLy5AkgrQVN7iA-1; Thu, 16 Jul 2020 06:01:12 -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 0C2628027F4; Thu, 16 Jul 2020 10:01:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB50D7010C; Thu, 16 Jul 2020 10:01:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A7AA09623E; Thu, 16 Jul 2020 10:01:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA11p2015687 for ; Thu, 16 Jul 2020 06:01:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6F8842B6E2; Thu, 16 Jul 2020 10:01:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6B6C2DE7F for ; Thu, 16 Jul 2020 10:01:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893689; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hSEa7kCM2KlbkRGsy7m0fLHcPv5I82P/jKvAJeIc/w4=; b=iCsY5uzXLVFo4IqvubYfebOPB4QB0qiHkboLBUpYdokfSOAAV1DhTITpXFGU3rEhYCmA0Z xG7eGIFeBMGJ9nt+YwkfGVKcCbg8Aw4MoIRH5zHPBo/jo2pjfx8CfvU5I1cwBoemXz7mwe iRWxXHDTIrLi5VyAFBY4n6bvpqhi6qo= X-MC-Unique: hH-3CBofOLy5AkgrQVN7iA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 041/351] meson: add curl build dependency Date: Thu, 16 Jul 2020 11:54:37 +0200 Message-Id: <621deba490843a494eaaf4af8769719bb23edb58.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- configure.ac | 3 --- m4/virt-curl.m4 | 38 -------------------------------------- meson.build | 17 +++++++++++++++++ meson_options.txt | 1 + 4 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 m4/virt-curl.m4 diff --git a/configure.ac b/configure.ac index acd326adf71..f89ea566c03 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_CURL LIBVIRT_ARG_DBUS LIBVIRT_ARG_FIREWALLD LIBVIRT_ARG_FIREWALLD_ZONE @@ -143,7 +142,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_CURL LIBVIRT_CHECK_DBUS LIBVIRT_CHECK_DEVMAPPER LIBVIRT_CHECK_DLOPEN @@ -465,7 +463,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_CURL LIBVIRT_RESULT_DBUS LIBVIRT_RESULT_DLOPEN LIBVIRT_RESULT_FIREWALLD diff --git a/m4/virt-curl.m4 b/m4/virt-curl.m4 deleted file mode 100644 index 84fcd69a8e0..00000000000 --- a/m4/virt-curl.m4 +++ /dev/null @@ -1,38 +0,0 @@ -dnl The libcurl.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_CURL],[ - LIBVIRT_ARG_WITH_FEATURE([CURL], [libcurl], [check], [7.18.0]) -]) - -AC_DEFUN([LIBVIRT_CHECK_CURL],[ - LIBVIRT_CHECK_PKG([CURL], [libcurl], [7.18.0]) - - # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version - # of that #defines several wrapper macros around underlying - # functions to add type safety for gcc only. However, these macros - # spuriously trip gcc's -Wlogical-op warning. Avoid the warning by - # disabling the wrappers; even if it removes some type-check safety. - CURL_CFLAGS=3D"-DCURL_DISABLE_TYPECHECK $CURL_CFLAGS" - AC_SUBST(CURL_CFLAGS) -]) - -AC_DEFUN([LIBVIRT_RESULT_CURL],[ - LIBVIRT_RESULT_LIB([CURL]) -]) diff --git a/meson.build b/meson.build index d504e7720d2..26378134118 100644 --- a/meson.build +++ b/meson.build @@ -979,6 +979,22 @@ if capng_dep.found() conf.set('WITH_CAPNG', 1) endif =20 +curl_version =3D '7.18.0' +curl_dep =3D dependency('libcurl', version: '>=3D' + curl_version, require= d: get_option('curl')) +if curl_dep.found() + # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version + # of that #defines several wrapper macros around underlying + # functions to add type safety for gcc only. However, these macros + # spuriously trip gcc's -Wlogical-op warning. Avoid the warning by + # disabling the wrappers; even if it removes some type-check safety. + curl_dep =3D declare_dependency( + compile_args: [ '-DCURL_DISABLE_TYPECHECK' ], + dependencies: [ curl_dep ], + ) + + conf.set('WITH_CURL', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1095,6 +1111,7 @@ libs_summary =3D { 'bash_completion': bash_completion_dep.found(), 'blkid': blkid_dep.found(), 'capng': capng_dep.found(), + 'curl': curl_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index f53c94c6982..f0d5e05b469 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -16,4 +16,5 @@ option('bash_completion', type: 'feature', value: 'auto',= description: 'bash-com option('bash_completion_dir', type: 'string', value: '', description: 'dir= ectory containing bash completion scripts') option('blkid', type: 'feature', value: 'auto', description: 'blkid suppor= t') option('capng', type: 'feature', value: 'auto', description: 'cap-ng suppo= rt') +option('curl', type: 'feature', value: 'auto', description: 'curl support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2