Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- tools/Makefile.am | 23 ----------------------- tools/nss/meson.build | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index d33e5a20885..4cb0a07afb8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -48,26 +48,3 @@ wireshark/src/libvirt/protocol.h: wireshark/util/genxdrstub.pl \ $(WS_DISSECTOR_PROTO_FILES) endif WITH_WIRESHARK_DISSECTOR - -if WITH_NSS -nss_libnss_libvirt_guest_la_SOURCES = -nss_libnss_libvirt_guest_la_LDFLAGS = \ - $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_GUEST_NSS_SYMBOL_FILE) \ - $(AM_LDFLAGS) \ - -module \ - -export-dynamic \ - -avoid-version \ - -shared \ - -shrext .so.$(NSS_SO_VER) - -nss_libnss_libvirt_guest_la_LIBADD = \ - nss/libnss_libvirt_guest_impl.la - -nss_libnss_libvirt_guest_la_DEPENDENCIES = \ - $(nss_libnss_libvirt_guest_la_LIBADD) \ - $(LIBVIRT_GUEST_NSS_SYMBOL_FILE) - -lib_LTLIBRARIES = \ - nss/libnss_libvirt_guest.la - -endif WITH_NSS diff --git a/tools/nss/meson.build b/tools/nss/meson.build index cfdcc1fe774..b07bfa4be8b 100644 --- a/tools/nss/meson.build +++ b/tools/nss/meson.build @@ -54,6 +54,11 @@ nss_libvirt_syms = '@0@@1@'.format( meson.current_source_dir() / nss_sym_file, ) +nss_libvirt_guest_syms = '@0@@1@'.format( + version_script_flags, + meson.current_source_dir() / nss_guest_sym_file, +) + nss_libvirt_lib = shared_module( 'nss_libvirt', name_prefix: nss_prefix, @@ -68,3 +73,18 @@ nss_libvirt_lib = shared_module( install: true, install_dir: libdir, ) + +nss_libvirt_guest_lib = shared_library( + 'nss_libvirt_guest', + name_prefix: nss_prefix, + name_suffix: 'so.@0@'.format(nss_so_ver), + link_args: [ + nss_libvirt_guest_syms, + libvirt_export_dynamic, + ], + link_whole: [ + nss_libvirt_guest_impl, + ], + install: true, + install_dir: libdir, +) -- 2.26.2
