From nobody Mon Apr 29 00:09:57 2024 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; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623659345180373.31758087211176; Mon, 14 Jun 2021 01:29:05 -0700 (PDT) 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-185-izB5Xy_mMlykYfxL3qNIYA-1; Mon, 14 Jun 2021 04:29:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D25F8805EF2; Mon, 14 Jun 2021 08:28:55 +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 3114F5D6A8; Mon, 14 Jun 2021 08:28: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 0612F46F59; Mon, 14 Jun 2021 08:28:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15E8SllF029209 for ; Mon, 14 Jun 2021 04:28:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9303630BB0; Mon, 14 Jun 2021 08:28:47 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 88DF443681 for ; Mon, 14 Jun 2021 08:28:44 +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-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B128C1825073 for ; Mon, 14 Jun 2021 08:28:44 +0000 (UTC) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.23]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-251-RbTQFE9eOA6-05rBOfhejQ-1; Mon, 14 Jun 2021 04:28:42 -0400 Received: from sender by smtp.strato.de (RZmta 47.27.2 AUTH) with ESMTPSA id j0415bx5E8Sdiko (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 14 Jun 2021 10:28:39 +0200 (CEST) X-MC-Unique: izB5Xy_mMlykYfxL3qNIYA-1 X-MC-Unique: RbTQFE9eOA6-05rBOfhejQ-1 X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzpIG0mv9coXAg5l+Vz7FJgt8+TgOd9sTrMwXjWWExsBKQCrpnqhqg==" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: libvir-list@redhat.com Subject: [PATCH v1] meson: fix xenstore and xentoollog detection Date: Mon, 14 Jun 2021 10:28:31 +0200 Message-Id: <20210614082831.15089-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.79 on 10.11.54.5 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.15 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" A xenstore.pc and xentoollog.pc exists only since Xen 4.9. Fixes commit fe7c07adac30994dd042515e1076e195128e15cd Signed-off-by: Olaf Hering --- meson.build | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 04c229d7f4..f3ff57d336 100644 --- a/meson.build +++ b/meson.build @@ -1500,14 +1500,22 @@ if not get_option('driver_libxl').disabled() and co= nf.has('WITH_LIBVIRTD') endif xl_util_dep =3D dependency('xlutil') =20 - xen_store_dep =3D dependency('xenstore') + # xenstore.pc exists since Xen 4.9 + if libxl_dep.version().version_compare('>=3D4.9.0') + xen_store_dep =3D dependency('xenstore') + else + xen_store_dep =3D cc.find_library('xenstore') + endif =20 # xtl_* infrastructure is in libxentoollog since Xen 4.7 previously # it was in libxenctrl. - if libxl_dep.version().version_compare('>=3D4.7.0') + # xentoollog.pc exists since Xen 4.9 + if libxl_dep.version().version_compare('>=3D4.9.0') xtl_link_dep =3D dependency('xentoollog') + elif libxl_dep.version().version_compare('>=3D4.7.0') + xtl_link_dep =3D cc.find_library('xentoollog') else - xtl_link_dep =3D dependency('xenctrl') + xtl_link_dep =3D cc.find_library('xenctrl') endif =20 if libxl_dep.version().version_compare('>=3D4.13.0')