From nobody Sun Feb 8 15:42:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1594894144; cv=none; d=zohomail.com; s=zohoarc; b=Sn6RO0m3/+sZP6T4jh4l89V2JjH6ksd4L/kqnr+AgGpGhJKx+6vJ3I41yJDKBmQzPHqLS0W9jbeZeZYFAV+1BVxc5hPZfBlXIM4GPyiGpfouNv93pqiZfiVSadzPfbAo7hWPAB0D7+dJ/7DO0p/N4lV1huMbHHyzrumwyqSecmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894144; 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=GLVUKL4GPobO5oAu/c2zVkI1iBzegmSIjwRX4xecuqo=; b=I75zjRCPopum8Tql37/YGosLLICPMpnN37dYp3JN8xWgf22Pe8QGDTTbt47d1rKLV9rSNqm+JJfUHt9vKjdlyDQ79SJ+NDileLEssNULEpOYeHdkYJy2wbQxZf6KKxtO1HQ2ICaRfAgEIHw1Oec+TvY8v0fEYH/5RNCPKB98fRg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894144144168.19501475590175; Thu, 16 Jul 2020 03:09:04 -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-23-7chfiES5NBOOwjHZmRBALA-1; Thu, 16 Jul 2020 06:08:29 -0400 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 145811888AB8; Thu, 16 Jul 2020 10:08:22 +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 E481E6FEF6; Thu, 16 Jul 2020 10:08:21 +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 B3A0D730D4; Thu, 16 Jul 2020 10:08:21 +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 06GA3v1v017560 for ; Thu, 16 Jul 2020 06:03:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id A3D752B6DB; Thu, 16 Jul 2020 10:03:57 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DAD22E026 for ; Thu, 16 Jul 2020 10:03:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894142; 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=GLVUKL4GPobO5oAu/c2zVkI1iBzegmSIjwRX4xecuqo=; b=g4eKiqWm7U82kSFgoWLR42L/m+BaW/SnICljiIHFfXmfugcp1Q7aUlenUWxisv29dE6fT7 KWZS5B61KWyfIyPLsYHAO0MlMgo5qkLcwGQhaVIrgq8PO2tK6S1c6RN4nyuX7qcP6d+l8N 8Y4XqmvtGybZegrP8uy4Fffo2WoBkM4= X-MC-Unique: 7chfiES5NBOOwjHZmRBALA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 148/351] meson: src: build libvirt_driver.a static library Date: Thu, 16 Jul 2020 11:56:24 +0200 Message-Id: <3cdee70c374fde812c3d880230d05ded917bff89.1594891445.git.phrdina@redhat.com> In-Reply-To: References: 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.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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/Makefile.am | 41 ----------------------------------------- src/meson.build | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 41 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b948ac47a6d..50807ee7491 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,7 +56,6 @@ OPENRC_CONF_FILES =3D SYSCONF_FILES =3D sbin_PROGRAMS =3D bin_PROGRAMS =3D -DRIVER_SOURCES =3D =20 COMMON_UNIT_VARS =3D \ -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ @@ -103,36 +102,6 @@ augeasdir =3D $(datadir)/augeas/lenses =20 augeastestdir =3D $(datadir)/augeas/lenses/tests =20 -DRIVER_SOURCES +=3D \ - driver.c driver.h \ - driver-hypervisor.h \ - driver-interface.h \ - driver-network.h \ - driver-nodedev.h \ - driver-nwfilter.h \ - driver-secret.h \ - driver-state.h \ - driver-storage.h \ - driver-stream.h \ - internal.h \ - $(DATATYPES_SOURCES) \ - libvirt.c libvirt_internal.h \ - libvirt-domain.c \ - libvirt-domain-checkpoint.c \ - libvirt-domain-snapshot.c \ - libvirt-host.c \ - libvirt-interface.c \ - libvirt-network.c \ - libvirt-nodedev.c \ - libvirt-nwfilter.c \ - libvirt-secret.c \ - libvirt-storage.c \ - libvirt-stream.c \ - $(NULL) - - - - # .libs/libvirt.so is built by libtool as a side-effect of the Makefile # rule for libvirt.la. However, checking symbols relies on Linux ELF layo= ut if WITH_LINUX @@ -246,16 +215,6 @@ check-local: check-protocol check-symfile check-symsor= ting \ # First deal with sources usable in non-daemon context =20 =20 -noinst_LTLIBRARIES +=3D libvirt_driver.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver.la -libvirt_driver_la_SOURCES =3D $(DRIVER_SOURCES) - -libvirt_driver_la_CFLAGS =3D \ - $(GNUTLS_CFLAGS) $(CURL_CFLAGS) $(XDR_CFLAGS) \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_driver_la_LIBADD =3D \ - $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS) - # All .syms files should be placed in exactly one of these three lists, # depending on whether they are stored in git and/or used in the build. SYM_FILES +=3D $(USED_SYM_FILES) diff --git a/src/meson.build b/src/meson.build index 2c56caf5442..753d93253ea 100644 --- a/src/meson.build +++ b/src/meson.build @@ -105,3 +105,38 @@ subdir('hyperv') subdir('openvz') subdir('test') subdir('vmware') + + +driver_sources =3D [ + 'driver.c', + 'libvirt.c', + 'libvirt-domain.c', + 'libvirt-domain-checkpoint.c', + 'libvirt-domain-snapshot.c', + 'libvirt-host.c', + 'libvirt-interface.c', + 'libvirt-network.c', + 'libvirt-nodedev.c', + 'libvirt-nwfilter.c', + 'libvirt-secret.c', + 'libvirt-storage.c', + 'libvirt-stream.c', +] + +driver_lib =3D static_library( + 'virt_driver', + [ + driver_sources, + datatypes_sources, + ], + dependencies: [ + curl_dep, + dlopen_dep, + gnutls_dep, + src_dep, + xdr_dep, + ], + include_directories: [ + conf_inc_dir, + ], +) --=20 2.26.2