From nobody Mon Feb 9 03:28:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1725545117910662.6490522839186; Thu, 5 Sep 2024 07:05:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C59FE177E; Thu, 5 Sep 2024 10:05:16 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4FB5B179F; Thu, 5 Sep 2024 09:55:04 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4961D167B; Thu, 5 Sep 2024 09:54:56 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 031E9175E for ; Thu, 5 Sep 2024 09:50:32 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-265-vGX099-xM6OZKYMv520Khw-1; Thu, 05 Sep 2024 09:50:31 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 46ED51955DD2 for ; Thu, 5 Sep 2024 13:50:30 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 884B230001AB for ; Thu, 5 Sep 2024 13:50:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: *** X-Spam-Status: No, score=3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725544232; h=from:from: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; bh=lo5fkKaARjOauA6B6l0zHWBseViVNH43ciVK6UQBiN0=; b=Q+0oUdX5Agjm+gMNMp54OhgBHbqI3I1CTrPwyJX29JjBcP1zKgRbgVjw8eBUJuInO0kLah 1bsZtUq5Kk7hnUXiR0h7tDz1LvCgW/IWrTRI0zkbpB3ke2f/w8x7U6McMUdw+vUZROzWH2 oY5ExIgglNMaqVYOWf3UpQ+lUiMPWdo= X-MC-Unique: vGX099-xM6OZKYMv520Khw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCHv2 06/15] meson: switch checks to depend on json-c as well as yajl Date: Thu, 5 Sep 2024 15:49:33 +0200 Message-ID: <393fe2b92ae628698ae941624dc3c31588dd1f70.1725544182.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QRBKZKGW4QWAUM3O6T4SN6CWVM44OS7K X-Message-ID-Hash: QRBKZKGW4QWAUM3O6T4SN6CWVM44OS7K X-MailFrom: jtomko@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725545118335116600 Content-Type: text/plain; charset="utf-8" Ensure both are required during this series to make bisecting smooth. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- libvirt.spec.in | 3 ++- meson.build | 12 ++++++------ meson_options.txt | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2bc4aa98d4..63ac63cb45 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -362,6 +362,7 @@ BuildRequires: augeas BuildRequires: systemd-devel >=3D 185 BuildRequires: libpciaccess-devel >=3D 0.10.9 BuildRequires: yajl-devel +BuildRequires: json-c-devel %if %{with_sanlock} BuildRequires: sanlock-devel >=3D 2.4 %endif @@ -1369,8 +1370,8 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/libvirt.spec) -Dapparmor_profiles=3Ddisabled \ -Dsecdriver_apparmor=3Ddisabled \ -Dudev=3Denabled \ - -Djson_c=3Ddisabled \ -Dyajl=3Denabled \ + -Djson_c=3Denabled \ %{?arg_sanlock} \ -Dlibpcap=3Denabled \ %{?arg_nbdkit} \ diff --git a/meson.build b/meson.build index 855df79e62..e15514ea00 100644 --- a/meson.build +++ b/meson.build @@ -1622,10 +1622,10 @@ if not get_option('driver_ch').disabled() and host_= machine.system() =3D=3D 'linux' a endif endif =20 - if not yajl_dep.found() + if not yajl_dep.found() or not json_c_dep.found() use_ch =3D false if get_option('driver_ch').enabled() - error('YAJL 2 is required to build Cloud-Hypervisor driver') + error('json-c is required to build Cloud-Hypervisor driver') endif endif =20 @@ -1696,10 +1696,10 @@ endif if not get_option('driver_qemu').disabled() use_qemu =3D true =20 - if not yajl_dep.found() + if not yajl_dep.found() or not json_c_dep.found() use_qemu =3D false if get_option('driver_qemu').enabled() - error('YAJL 2 is required to build QEMU driver') + error('json-c is required to build QEMU driver') endif endif =20 @@ -2029,9 +2029,9 @@ endif =20 if not get_option('nss').disabled() use_nss =3D true - if not yajl_dep.found() + if not yajl_dep.found() or not json_c_dep.found() if get_option('nss').enabled() - error('Can\'t build nss plugin without yajl') + error('Can\'t build nss plugin without json-c') else use_nss =3D false endif diff --git a/meson_options.txt b/meson_options.txt index 9b1610fcfe..122cda0350 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -68,14 +68,14 @@ option('driver_libvirtd', type: 'feature', value: 'auto= ', description: 'libvirtd option('driver_libxl', type: 'feature', value: 'auto', description: 'libxe= nlight driver') # dep:driver_remote dep:driver_libvirtd option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux C= ontainer driver') -# dep:curl dep:yajl dep:driver_remote dep:driver_libvirtd +# dep:curl dep:json_c dep:driver_remote dep:driver_libvirtd option('driver_ch', type: 'feature', value: 'auto', description: 'Cloud-Hy= pervisor driver') option('ch_user', type: 'string', value: '', description: 'username to run= Cloud-Hypervisor system instance as') option('ch_group', type: 'string', value: '', description: 'groupname to r= un Cloud-Hypervisor system instance as') # dep:driver_remote dep:driver_libvirtd option('driver_network', type: 'feature', value: 'auto', description: 'vir= tual network driver') option('driver_openvz', type: 'feature', value: 'auto', description: 'Open= VZ driver') -# dep:yajl dep:driver_remote dep:driver_libvirtd +# dep:json_c dep:driver_remote dep:driver_libvirtd option('driver_qemu', type: 'feature', value: 'auto', description: 'QEMU/K= VM driver') option('qemu_user', type: 'string', value: '', description: 'username to r= un QEMU system instance as') option('qemu_group', type: 'string', value: '', description: 'groupname to= run QEMU system instance as') @@ -123,7 +123,7 @@ option('host_validate', type: 'feature', value: 'auto',= description: 'build virt option('init_script', type: 'combo', choices: ['systemd', 'openrc', 'check= ', 'none'], value: 'check', description: 'Style of init script to install') option('loader_nvram', type: 'string', value: '', description: 'Pass list = of pairs of : paths. Both pairs and list items are separated= by a colon.') option('login_shell', type: 'feature', value: 'auto', description: 'build = virt-login-shell') -# dep:yajl dep:driver_network dep:libvirtd +# dep:json_c dep:driver_network dep:libvirtd option('nss', type: 'feature', value: 'auto', description: 'enable Name Se= rvice Switch plugin for resolving guest IP addresses') # dep:numactl option('numad', type: 'feature', value: 'auto', description: 'use numad to= manage CPU placement dynamically') --=20 2.46.0