From nobody Fri Apr 26 13:29:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1641655806; cv=none; d=zohomail.com; s=zohoarc; b=Bv/6OdsQxoPUnY484nHhFoOh1v1kJmFQ16c0iob51vofnmwcHf/yLCVXLkhoCRbEBS5FWa1wjzGzDyvbNldziFUEU8MdTZIsMCuxBLDxp0xN/1cLkAzntV5VTILQrHR12XBGgZSXF7RRGrALZ7sSA5TvL7ZdGR+bElnvoPxI8k0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641655806; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=JuHRKSgXXzNEHF3J64NrBmF3C/txv6rDLgm4/wKvpyg=; b=BSAjTaOj3bAckNDGaxU0xsnt3SMqzBmYIUMMgm4EZv80rbW2cSYQsysvmNdIdlgRUMTJYi6yq7nY6Ir/90s/2UQrEZsnUrwY3KLsWHaK/wbQQHFevouZMJ9gMrmnha1BtrG7MUUja+L3xuaYpZNCjMXrsAfHDfuYMXy8H25GJSM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1641655806775564.4989762493162; Sat, 8 Jan 2022 07:30:06 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-551-5HgJbni0PKW7SnM_Yc52ag-1; Sat, 08 Jan 2022 10:30:03 -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 134C91083F60; Sat, 8 Jan 2022 15:29:57 +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 7617985F03; Sat, 8 Jan 2022 15:29:55 +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 2428E4BB7C; Sat, 8 Jan 2022 15:29:51 +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 208FTn27028040 for ; Sat, 8 Jan 2022 10:29:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id 18F772BCD9; Sat, 8 Jan 2022 15:29:49 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B40F2BCD6 for ; Sat, 8 Jan 2022 15:29:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641655805; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JuHRKSgXXzNEHF3J64NrBmF3C/txv6rDLgm4/wKvpyg=; b=D0HEEh5krphAFC/7uEBICYpeqg6usFAiM48WBUI9blxvW5Fo0Df5nJliW7dp8pRnkT0VLT GnbHipE6aNagZ2rTUtpGYB2STCTuYIcfXOrzFdyuIVeAzA40jjYuPFTOCeTNtaPWarsbd6 gdVPpmlmjrPNCq2wUGRg86NE5J6NOqY= X-MC-Unique: 5HgJbni0PKW7SnM_Yc52ag-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] meson: Fix yajl workaround Date: Sat, 8 Jan 2022 16:29:35 +0100 Message-Id: <20220108152935.1164560-1-abologna@redhat.com> 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.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 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1641655808427100001 Content-Type: text/plain; charset="utf-8" Recent versions of Meson report WARNING: pkgconfig variable 'cflags' not defined for dependency yajl. which makes sense, because "cflags" is not one of the variables reported by $ pkg-config --print-variables yajl and $ pkg-config --variable=3Dcflags yajl doesn't work either. Use "includedir", which is a proper pkg-config variable, instead. Signed-off-by: Andrea Bolognani Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov --- meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index ec7dcffac4..214a3f05eb 100644 --- a/meson.build +++ b/meson.build @@ -1356,17 +1356,18 @@ if yajl_dep.found() # # [1] https://github.com/Homebrew/homebrew-core/pull/74516 if host_machine.system() !=3D 'linux' - cflags =3D yajl_dep.get_pkgconfig_variable('cflags') - if cflags.contains('include/yajl') + includedir =3D yajl_dep.get_pkgconfig_variable('includedir') + if includedir.contains('include/yajl') rc =3D run_command( 'python3', '-c', 'print("@0@".replace("@1@", "@2@"))'.format( - cflags, 'include/yajl', 'include', + includedir, 'include/yajl', 'include', ), check: true, ) + includedir =3D rc.stdout().strip() yajl_dep =3D declare_dependency( - compile_args: rc.stdout().strip().split(), + compile_args: [ '-I' + includedir ], dependencies: [ yajl_dep ], ) endif --=20 2.31.1