From nobody Sun Feb 8 22:53:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1643739265; cv=none; d=zohomail.com; s=zohoarc; b=bl99rx63Vv/rhd27+9qoWb7P5IeHP14Tjv1+As09Yeh6/zeAcqh1BGGMrPY+51dbckLqKIXaKI4HhC8Dql3gAEK3QHXBV6lU3nvQwrdQ+AtjIjUgqczbe9raLyd1JBNj/0WxKImcAkMp3yUjZ5V6Ykw6ZUIpqzkZxKM3ZCgx4EY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643739265; 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=9N3LLQKxmpXf2iN5mP+OVd7gUSC5qXPxP6lE/i5xAiM=; b=lkkfi7FHH6psUZjpHrLDVirhts9USCZw6vM25LkPM83HSskevjD+g2gfm0z5gU+dDp1UvuWQkadzjFDDkpE9ClpZfBRoeXCmR8tprNWOpfyD42LZdXIm9unZE4JlxsMoDyLT6V2zHXVx9/IuGUiKEVVrS85U2aWjbXQoqR2yRDg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1643739265851988.4707458725525; Tue, 1 Feb 2022 10:14:25 -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-12-XFg8h9dKMxGpjUYjFvMZvA-1; Tue, 01 Feb 2022 13:14:22 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54766190D344; Tue, 1 Feb 2022 18:14:17 +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 B3D1F84773; Tue, 1 Feb 2022 18:14:16 +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 C1DB61809C88; Tue, 1 Feb 2022 18:14:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 211IEEKQ002826 for ; Tue, 1 Feb 2022 13:14:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id 78F1B84A34; Tue, 1 Feb 2022 18:14:14 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.108]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6CE484A39 for ; Tue, 1 Feb 2022 18:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643739265; 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=9N3LLQKxmpXf2iN5mP+OVd7gUSC5qXPxP6lE/i5xAiM=; b=VNLQswKw+jB3Tq+zQvxs8nLfFKMM24oEOxyShRDTL79c+mQXC6cVgRyvVydkF8tRQRC5N+ BEhGTYWhlmeNwp3uFsvN/J2VLJsElaTm61EcqG+wp+tOPHfyWHSJajX29/P9+nAJaaVddi 9cUQQ4w0MGl8R4nBMJStmgyqNr4UhbE= X-MC-Unique: XFg8h9dKMxGpjUYjFvMZvA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] meson: Don't overwrite includedir Date: Tue, 1 Feb 2022 19:14:11 +0100 Message-Id: <20220201181411.53770-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.16 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: 1643739268300100001 Content-Type: text/plain; charset="utf-8" The current implementation of the workaround for yajl's broken pkg-config file accidentally overwrites the value of includedir that is later used by the installation process. Rename the local variable to avoid this issue. Fixes: c97075e1e46e9305d62620d8b05046aae0139438 Closes: https://gitlab.com/libvirt/libvirt/-/issues/271 Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 0e6f0f22fc..9016c0458a 100644 --- a/meson.build +++ b/meson.build @@ -1325,18 +1325,18 @@ if yajl_dep.found() # # [1] https://github.com/Homebrew/homebrew-core/pull/74516 if host_machine.system() !=3D 'linux' - includedir =3D yajl_dep.get_pkgconfig_variable('includedir') - if includedir.contains('include/yajl') + yajl_includedir =3D yajl_dep.get_pkgconfig_variable('includedir') + if yajl_includedir.contains('include/yajl') rc =3D run_command( 'python3', '-c', 'print("@0@".replace("@1@", "@2@"))'.format( - includedir, 'include/yajl', 'include', + yajl_includedir, 'include/yajl', 'include', ), check: true, ) - includedir =3D rc.stdout().strip() + yajl_includedir =3D rc.stdout().strip() yajl_dep =3D declare_dependency( - compile_args: [ '-I' + includedir ], + compile_args: [ '-I' + yajl_includedir ], dependencies: [ yajl_dep ], ) endif --=20 2.34.1