From nobody Sun Feb 8 17:41:23 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=1594895137; cv=none; d=zohomail.com; s=zohoarc; b=eWCO15bQ0dd1Vvr5MyNv8m5JNgMDVmiTOZIbLyR79uqQeBNrvEbP+wpBEuqgyqZImBk9gQhlXyRYRaDFWnirRZi08OfOWJu1JbvEju2Bgt6LJPSCnJVFm+HmOgqqlkP49YDPxuYF837iJ3jQUiQtqOGByElw0LMgjB0WGM69KUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895137; 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=63zFKPyCjMflMzcExAJG+kpAwOX+wPr4Cui2Mo1cmNw=; b=MyRKG+rbhjmAT5eUVwxDNzchHdY3HvmY2qMqskPgkiCzY+gwKocn8dJXMR+y3WBvScpKtlBiXXEeCukGb5KoORSd5ql/0IRomzQd2b+XT6M3CfNUjRNcGKPJGbl+9XzFtMVIzJbXpWQJer6Ic0A5Z/wtDGCEsz/pna0vfQfn6OU= 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 1594895137726195.49402844382723; Thu, 16 Jul 2020 03:25:37 -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-404-6xTEn95SOtu_riDygXZipA-1; Thu, 16 Jul 2020 06:08:37 -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 3DFA21099; Thu, 16 Jul 2020 10:08:31 +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 16D2260E3E; Thu, 16 Jul 2020 10:08:31 +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 D78D3730E5; Thu, 16 Jul 2020 10:08:30 +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 06GA434U017629 for ; Thu, 16 Jul 2020 06:04:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2C5252DE69; Thu, 16 Jul 2020 10:04:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AB592B6DB for ; Thu, 16 Jul 2020 10:04:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895136; 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=63zFKPyCjMflMzcExAJG+kpAwOX+wPr4Cui2Mo1cmNw=; b=PWBaAFte1RB+piEOIlCUePNfV1HadNbA5Y2EQ60yzNAd4wyUsDjsEzMd57fdMijqLj+0iM F5dFFuZIrP1LG2hZqXuvLtig0m8rMMKv1i7io1tHav6buNbQTxXTkgvrandAZNihlJgCqM Tmab0KOGoxKc4kytNR1wlDWrs9Q+V8o= X-MC-Unique: 6xTEn95SOtu_riDygXZipA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 154/351] meson: src: build libvirt-qemu.so library Date: Thu, 16 Jul 2020 11:56:30 +0200 Message-Id: <0f327b5a5c84a420fcb53b270f58dda52d41673a.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 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 --- m4/virt-win-symbols.m4 | 3 --- src/Makefile.am | 14 ++---------- src/meson.build | 48 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/m4/virt-win-symbols.m4 b/m4/virt-win-symbols.m4 index f7b8e612a8d..dc5c5daa660 100644 --- a/m4/virt-win-symbols.m4 +++ b/m4/virt-win-symbols.m4 @@ -20,7 +20,6 @@ dnl AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.syms LIBVIRT_LXC_SYMBOL_FILE=3D'$(srcdir)/libvirt_lxc.syms' - LIBVIRT_QEMU_SYMBOL_FILE=3D'$(srcdir)/libvirt_qemu.syms' case "$host" in *-*-mingw* ) # Also set the symbol file to .def, so src/Makefile generates libvir= t.def @@ -28,10 +27,8 @@ AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ # linker LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.def LIBVIRT_LXC_SYMBOL_FILE=3Dlibvirt_lxc.def - LIBVIRT_QEMU_SYMBOL_FILE=3Dlibvirt_qemu.def ;; esac AC_SUBST([LIBVIRT_ADMIN_SYMBOL_FILE]) AC_SUBST([LIBVIRT_LXC_SYMBOL_FILE]) - AC_SUBST([LIBVIRT_QEMU_SYMBOL_FILE]) ]) diff --git a/src/Makefile.am b/src/Makefile.am index e727ad32944..5655655ee32 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -64,7 +64,7 @@ COMMON_UNIT_VARS =3D \ =20 # Set these variables before we include any of the subdirs as libvirt-admi= n.la # has to be installed after libvirt.la. -lib_LTLIBRARIES +=3D libvirt-qemu.la libvirt-lxc.la +lib_LTLIBRARIES +=3D libvirt-lxc.la =20 include util/Makefile.inc.am include security/Makefile.inc.am @@ -206,7 +206,7 @@ check-local: check-protocol check-symfile check-symsort= ing \ # depending on whether they are stored in git and/or used in the build. SYM_FILES +=3D $(USED_SYM_FILES) GENERATED_SYM_FILES +=3D \ - libvirt_qemu.def libvirt_lxc.def \ + libvirt_lxc.def \ $(NULL) =20 =20 @@ -246,16 +246,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir= )/scripts/gensystemtap.py =20 endif WITH_DTRACE_PROBES =20 -libvirt_qemu_la_SOURCES =3D libvirt-qemu.c -libvirt_qemu_la_LDFLAGS =3D \ - $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(LIBVIRT_NODELETE) \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_qemu_la_CFLAGS =3D $(AM_CFLAGS) -libvirt_qemu_la_LIBADD =3D libvirt.la - libvirt_lxc_la_SOURCES =3D libvirt-lxc.c libvirt_lxc_la_LDFLAGS =3D \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_LXC_SYMBOL_FILE) \ diff --git a/src/meson.build b/src/meson.build index 748bb7a9914..a7fbff674c6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -257,3 +257,51 @@ libvirt_lib =3D shared_library( version: libvirt_lib_version, soversion: libvirt_so_version, ) + + +# libvirt-qemu.syms symbol files + +libvirt_qemu_syms =3D meson.current_source_dir() / 'libvirt_qemu.syms' +libvirt_qemu_syms_file =3D libvirt_qemu_syms +libvirt_qemu_syms_path =3D libvirt_qemu_syms +if host_machine.system() =3D=3D 'windows' + libvirt_qemu_def =3D custom_target( + 'libvirt_qemu.def', + input: libvirt_qemu_syms, + output: 'libvirt_qemu.def', + command: [ gen_def_files_prog, '@INPUT@' ], + capture: true, + ) + libvirt_qemu_syms_file =3D libvirt_qemu_def + libvirt_qemu_syms_path =3D libvirt_qemu_def.full_path() +endif + + +# libvirt-qemu.so + +libvirt_qemu_syms_flags =3D '@0@@1@'.format( + version_script_flags, + libvirt_qemu_syms_path, +) + +libvirt_qemu_lib =3D shared_library( + 'virt-qemu', + 'libvirt-qemu.c', + dependencies: [ + src_dep, + ], + link_args: [ + libvirt_nodelete, + libvirt_qemu_syms_flags, + ], + link_with: [ + libvirt_lib, + ], + link_depends: [ + libvirt_qemu_syms_file, + ], + install: true, + install_rpath: libdir, + version: libvirt_lib_version, + soversion: libvirt_so_version, +) --=20 2.26.2