From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC904C4361B for ; Thu, 17 Dec 2020 10:14:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5700D23741 for ; Thu, 17 Dec 2020 10:14:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5700D23741 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpqIs-0001pq-EB for qemu-devel@archiver.kernel.org; Thu, 17 Dec 2020 05:14:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpqDz-0006CW-5g for qemu-devel@nongnu.org; Thu, 17 Dec 2020 05:09:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57109) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpqDk-0000FZ-P1 for qemu-devel@nongnu.org; Thu, 17 Dec 2020 05:09:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608199753; h=from:from:reply-to: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=QAAK5PrPnvuu1ATu55SE0CNzMR2cB+J4D1xqqg2Rw58=; b=SCgBWGPgPlKxt3U4vcBFLlV7q+AWCJU1T2EXj7BnPEGLtY/wfLTrcWtZKoDUgpZIzd+V5T 0mVoEag4RS93E/+M78IJMEe28rq9oGMvqwrMVN+Y6zNrXHtT41834QzAFpUaAMDlukT85b O2AofPOr5Sv6dkwgpwor/xCK/nKikL0= 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-406-bMJ6nFM8NpSvJdmYybWJzg-1; Thu, 17 Dec 2020 05:09:08 -0500 X-MC-Unique: bMJ6nFM8NpSvJdmYybWJzg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D2746D520 for ; Thu, 17 Dec 2020 10:09:07 +0000 (UTC) Received: from redhat.com (ovpn-115-33.ams2.redhat.com [10.36.115.33]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D71FE19C9B; Thu, 17 Dec 2020 10:09:01 +0000 (UTC) Date: Thu, 17 Dec 2020 10:08:57 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Paolo Bonzini Subject: Re: [PATCH 02/18] curl: remove compatibility code, require 7.29.0 Message-ID: <20201217100857.GC247354@redhat.com> References: <20201217094044.46462-1-pbonzini@redhat.com> <20201217094044.46462-3-pbonzini@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201217094044.46462-3-pbonzini@redhat.com> User-Agent: Mutt/1.14.6 (2020-07-11) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=berrange@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, 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: =?utf-8?B?TWFyYy1BbmRyw4PCqQ==?= Lureau , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Dec 17, 2020 at 10:40:28AM +0100, Paolo Bonzini wrote: > cURL 7.16.0 was released in October 2006. Just remove code that is > in all likelihood not being used anywhere, and require the oldest version > found in currently supported distros, which is 7.29.0 from CentOS 7. > > pkg-config is enough for QEMU, since it does not need extra information > such as the path for certicate authorities. All supported platforms > today will all have pkg-config for curl, so we can drop curl-config. > > Suggested-by: Daniel Berrangé > Signed-off-by: Paolo Bonzini > --- > block/curl.c | 28 ---------------------------- > configure | 9 ++------- > 2 files changed, 2 insertions(+), 35 deletions(-) > > diff --git a/configure b/configure > index 42b39544d4..c0a3e1556b 100755 > --- a/configure > +++ b/configure > @@ -3428,17 +3428,12 @@ done > ########################################## > # curl probe > if test "$curl" != "no" ; then > - if $pkg_config libcurl --exists; then > - curlconfig="$pkg_config libcurl" > - else > - curlconfig=curl-config > - fi > cat > $TMPC << EOF > #include > int main(void) { curl_easy_init(); curl_multi_setopt(0, 0, 0); return 0; } > EOF > - curl_cflags=$($curlconfig --cflags 2>/dev/null) > - curl_libs=$($curlconfig --libs 2>/dev/null) > + curl_cflags=$($pkg_config libcurl --cflags 2>/dev/null) > + curl_libs=$($pkg_config libcurl --libs 2>/dev/null) Should really be libcurl >= 7.29.0, but since you're removing this in the next patch, and have the right version check in meson, I'm ambivalent here. Reviewed-by: Daniel P. Berrangé Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|