From nobody Sun Feb 8 04:11:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1605287019; cv=none; d=zohomail.com; s=zohoarc; b=RQ3xoMe3tOZE3PIP+hkNLllPtfUEwoYuHJVIpfIXPCDhBgzC0owkfcbwvO2tapjN+2MBMUApaB4F6nyZw0/UqtrAmWAZMU2+IjoLzFRkSYRD+Bnw8XWzb1UW9VcGqTlWwUlKAHGq0HVQDs+7E4SW1QBqlUUbaTbOwPfYPkxXq8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605287019; 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=djTG+HmTf1IRwDd0ippns/HxDkyBOpz1HmF832o2Bys=; b=gZB9ahZ27jJfHrJzg40LWEAfL1dgAtiKHZHZL2iysVQGvgtGdjKnxTwFzvog2GMmGcYXt1wTcaFyzW77F+Gsd4ANB1r2TYREgDuQsfMfr5xd3BxEZtt+hCiprZsTmlDFmHZq5Wl2hNJUPFACJsffnwOCSgFq8xfgrRHCABsDl+w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605287019393814.2743902845912; Fri, 13 Nov 2020 09:03:39 -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-537-LnmM0Qn7NIaQORwi1IsCEg-1; Fri, 13 Nov 2020 12:03:34 -0500 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 9978C804753; Fri, 13 Nov 2020 17:03:27 +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 4170D60C11; Fri, 13 Nov 2020 17:03:27 +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 E85D8181A870; Fri, 13 Nov 2020 17:03:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ADH3OTB030801 for ; Fri, 13 Nov 2020 12:03:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7FADA5C5BB; Fri, 13 Nov 2020 17:03:24 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-180.ams2.redhat.com [10.36.113.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE2B15C629; Fri, 13 Nov 2020 17:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605287018; 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=djTG+HmTf1IRwDd0ippns/HxDkyBOpz1HmF832o2Bys=; b=btIzI4G/AUboZjYaRAdpDoTsBVGKbqavTHtv5QIQQL4GbYLvL/JDhnXwwMGfrdaet9lECQ hLggQ33QYFwEfIHxYA4oWBiHCnFX6PSJi2PkGI5YWVhgy95lOQhbm9PVnonH16MzChTOMX YYz8L24GP53kp/NiGyse0rksl4X+02g= X-MC-Unique: LnmM0Qn7NIaQORwi1IsCEg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] meson: assume pkg-config support for yajl Date: Fri, 13 Nov 2020 17:03:15 +0000 Message-Id: <20201113170318.100088-2-berrange@redhat.com> In-Reply-To: <20201113170318.100088-1-berrange@redhat.com> References: <20201113170318.100088-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Per the platform support rules, we no longer need to consider SLES 12 as a target, and so can now assume pkg-config support in yajl. Signed-off-by: Daniel P. Berrang=C3=A9 --- meson.build | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/meson.build b/meson.build index cecaad199d..816cf97a19 100644 --- a/meson.build +++ b/meson.build @@ -1460,25 +1460,7 @@ else endif =20 yajl_version =3D '2.0.3' -if not get_option('yajl').disabled() - yajl_dep =3D dependency('yajl', version: '>=3D' + yajl_version, required= : false) - # 2.0.3 was the version where the pkg-config file was first added - # SLES 12 and openSUSE Leap 42.3 still use 2.0.1 - # TODO: delete this in July 2020 - 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 ') - if not has_func and get_option('yajl').enabled() - error('yajl >=3D @0@ was not found'.format(yajl_version)) - elif not has_func - yajl_dep =3D dependency('', required: false) - endif - endif - endif -else - yajl_dep =3D dependency('', required: false) -endif +yajl_dep =3D dependency('yajl', version: '>=3D' + yajl_version, required: = get_option('yajl')) if yajl_dep.found() conf.set('WITH_YAJL', 1) endif --=20 2.28.0