From nobody Mon May 6 14:00:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605222125; cv=none; d=zohomail.com; s=zohoarc; b=nUJ2auhKCJOK50XH9OCFJt6TCtXCVwFgcmDQNgiV9uOHc8q6wS5059a/4JUohTRRQ/yg2LDk43WpEkiIW68jr0UGobbTHnjJhQHjLRAwhiAMw05kmKoaEDDiqqH0T+gECwuIVkf4p2u8gFAziWl6gUDNIJCqcfwCh3xL8UlxoZs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605222125; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=j1g5bycNUg/M1tHDjlDBMhg83jB/zxRorQJe/MzIJ1o=; b=fiSyOD01KtnX9lkVunwWd6qrwJJW5apdwRDfaR4cb91rjYcN5UTAD1mzmjXejcdsvb8w67F4Ko2gHWnRMobfzEkZvZicGCDxv+weXCjamxUTZw0msA/OticNm+kWkv+1U6b7MRKq7x4xKQO9q3z1DF/hGS3V2hBPFmvL4zRP8tU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 16052221252694.938229908377366; Thu, 12 Nov 2020 15:02:05 -0800 (PST) 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-508-tedkLDaTOOeUVxQeYM7IHA-1; Thu, 12 Nov 2020 18:02:00 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7BC3E8049D5; Thu, 12 Nov 2020 23:01:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B09D6EF66; Thu, 12 Nov 2020 23:01:52 +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 2420B180B658; Thu, 12 Nov 2020 23:01:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ACN1lPt014533 for ; Thu, 12 Nov 2020 18:01:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id A52612156A52; Thu, 12 Nov 2020 23:01:47 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FA8C2156A4F for ; Thu, 12 Nov 2020 23:01:45 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 20AA8858296 for ; Thu, 12 Nov 2020 23:01:45 +0000 (UTC) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.220]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-391-DPh5LG-QP-iDPiLCmbMPzw-1; Thu, 12 Nov 2020 18:01:42 -0500 Received: from sender by smtp.strato.de (RZmta 47.3.4 DYNA|AUTH) with ESMTPSA id V0b6ccwACN1eD6i (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Fri, 13 Nov 2020 00:01:40 +0100 (CET) X-MC-Unique: tedkLDaTOOeUVxQeYM7IHA-1 X-MC-Unique: DPh5LG-QP-iDPiLCmbMPzw-1 X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS3GhJjw==" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: libvir-list@redhat.com Subject: [PATCH v1] meson: fix yajl detection Date: Fri, 13 Nov 2020 00:01:39 +0100 Message-Id: <20201112230139.10517-1-olaf@aepfle.de> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Olaf Hering 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" yajl_tree_parse is declared in yajl/yajl_tree.h autoconf is more forgiving, the error did not trigger because yajl_tree_parse is not actually used. Fixes commit 44b8df4cb4b3f0c143e0330f543812e6bcd5c9f0 Fixes commit 88ab32a4e555f67dae3204fbc3bcf63d3da8ad2b Signed-off-by: Olaf Hering --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 9ee8dffa60..2b2ce6dfb1 100644 --- a/meson.build +++ b/meson.build @@ -1471,7 +1471,7 @@ if not get_option('yajl').disabled() if not yajl_dep.found() yajl_dep =3D cc.find_library('yajl', required: get_option('yajl')) if yajl_dep.found() - has_func =3D cc.has_function('yajl_tree_parse', dependencies: yajl_d= ep, prefix: '#include ') + has_func =3D cc.has_function('yajl_tree_parse', dependencies: yajl_d= ep, prefix: '#include ') if not has_func and get_option('yajl').enabled() error('yajl >=3D @0@ was not found'.format(yajl_version)) elif not has_func