From nobody Sun Feb 8 13:38:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1594894686; cv=none; d=zohomail.com; s=zohoarc; b=YkOcnsZrqKzkIyN8wmO16wRpoTiwehJyA02AzalJSjCQXyQO7qcT9mYly/Gn5yA3G5fNbM3bMIWck+Q4s3jEoFfwQIpoeQ7xaSTABDj7BJJ/YghBc5VhWvhCxqkwiJ+fmcZIpmW5XPLXU8bTkwaYn+JL/U0uYJtyGaewn6hx+q4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894686; 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=0SAyMFppEJeAzIJcnPZDmNoMEHfkqm5VcvxhJN4Pic8=; b=LPNK9r/O4Lh1IOm+3A/GG8F/txX+kZZPT5I77uGOovCf8TFUxivvvrJ1GFtklLHPCvRNh343OoeoBZ3dCVkiIrLnsd+G324RmqMnDCaqEZ6fm0A2q7cbNkMII1rrIwm3YWHQ6ayzFR/mgRSUp+fFha4HdEWMI2H1iv1qaD3ak1c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594894686889101.92285249330234; Thu, 16 Jul 2020 03:18:06 -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-461-3ToBw_CbMpqQC387A9rrww-1; Thu, 16 Jul 2020 06:14:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 624D11888AAD; Thu, 16 Jul 2020 10:14:03 +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 3F4DF2B6DB; Thu, 16 Jul 2020 10:14:03 +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 0E2F0730FF; Thu, 16 Jul 2020 10:14:03 +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 06GA6SHx019621 for ; Thu, 16 Jul 2020 06:06:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id B249F2B6DC; Thu, 16 Jul 2020 10:06:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D6342B6DB for ; Thu, 16 Jul 2020 10:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894685; 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=0SAyMFppEJeAzIJcnPZDmNoMEHfkqm5VcvxhJN4Pic8=; b=GoogsTjElXpHGdV2LSpp+am0fUCMfjh0WwQ7+RzQFdguETY+WOOq+4EY1AJeL6ncnVJ+EY 35H2BFf1l0wvFtCMb2RSWTv2E6azYbusQQVW9OsIMTDTUucj91TMqKMvdnumIcG9DhFWH3 SXeGeHu99NAX8rD92SVvfbsp5QOnotE= X-MC-Unique: 3ToBw_CbMpqQC387A9rrww-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 269/351] meson: tools: introduce nss directory Date: Thu, 16 Jul 2020 11:58:25 +0200 Message-Id: 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.84 on 10.5.11.23 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 --- tools/Makefile.am | 33 --------------------------------- tools/meson.build | 4 ++++ tools/nss/meson.build | 11 +++++++++++ 3 files changed, 15 insertions(+), 33 deletions(-) create mode 100644 tools/nss/meson.build diff --git a/tools/Makefile.am b/tools/Makefile.am index 9c91cac9ccf..3d9d042d2f3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,10 +23,6 @@ STANDALONE_CPPFLAGS =3D -I$(top_srcdir) =20 noinst_LTLIBRARIES =3D =20 -install-data-local: install-nss - -uninstall-local: uninstall-nss - if WITH_WIRESHARK_DISSECTOR =20 ws_plugin_LTLIBRARIES =3D wireshark/src/libvirt.la @@ -57,35 +53,6 @@ wireshark/src/libvirt/protocol.h: wireshark/util/genxdrs= tub.pl \ =20 endif WITH_WIRESHARK_DISSECTOR =20 -if WITH_BSD_NSS -LIBVIRT_NSS_SYMBOL_FILE =3D \ - $(srcdir)/nss/libvirt_nss_bsd.syms -LIBVIRT_GUEST_NSS_SYMBOL_FILE =3D \ - $(LIBVIRT_NSS_SYMBOL_FILE) -NSS_SO_VER =3D 1 - -install-nss: - ( cd $(DESTDIR)$(libdir) && \ - rm -f nss_libvirt.so.$(NSS_SO_VER) && \ - $(LN_S) libnss_libvirt.so.$(NSS_SO_VER) nss_libvirt.so.$(NSS_SO_VER) &&= \ - rm -f nss_libvirt_guest.so.$(NSS_SO_VER) && \ - $(LN_S) libnss_libvirt_guest.so.$(NSS_SO_VER) \ - nss_libvirt_guest.so.$(NSS_SO_VER)) - -uninstall-nss: - -rm -f $(DESTDIR)$(libdir)/nss_libvirt.so.$(NSS_SO_VER) - -rm -f $(DESTDIR)$(libdir)/nss_libvirt_guest.so.$(NSS_SO_VER) -else ! WITH_BSD_NSS -LIBVIRT_NSS_SYMBOL_FILE =3D \ - $(srcdir)/nss/libvirt_nss.syms -LIBVIRT_GUEST_NSS_SYMBOL_FILE =3D \ - $(srcdir)/nss/libvirt_guest_nss.syms -NSS_SO_VER =3D 2 - -install-nss: -uninstall-nss: -endif ! WITH_BSD_NSS - LIBVIRT_NSS_SOURCES =3D \ nss/libvirt_nss.c \ nss/libvirt_nss.h \ diff --git a/tools/meson.build b/tools/meson.build index 36c05d43d9c..52d997d2e73 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -282,3 +282,7 @@ endif if bash_completion_dep.found() subdir('bash-completion') endif + +if conf.has('WITH_NSS') + subdir('nss') +endif diff --git a/tools/nss/meson.build b/tools/nss/meson.build new file mode 100644 index 00000000000..b83a63c9c34 --- /dev/null +++ b/tools/nss/meson.build @@ -0,0 +1,11 @@ +if conf.has('WITH_BSD_NSS') + nss_sym_file =3D 'libvirt_nss_bsd.syms' + nss_guest_sym_file =3D nss_sym_file + nss_so_ver =3D '1' + nss_prefix =3D '' +else + nss_sym_file =3D 'libvirt_nss.syms' + nss_guest_sym_file =3D 'libvirt_guest_nss.syms' + nss_so_ver =3D '2' + nss_prefix =3D 'lib' +endif --=20 2.26.2