libnsl: Do not install libnsl.so, libnsl.a if NIS is disabled [BZ #22701]

This also skips building the .o files for libnsl.a.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 6b451ff2c60b3928dba7ab1f46480631821b650f..eb739177fa5402d500c14546ebfb6ea37b5d34dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-01-12  Florian Weimer  <fweimer@redhat.com>
+
+       [BZ #22701]
+       * nis/Makefile (install-lib-ldscripts, $(inst_libdir)/libnsl.so):
+       Prevent installation of libnsl.so.
+       (libnsl-inhibit-o): Do not build (or install) static libraries.
+
 2018-01-12  Rafal Luzynski <digitalfreak@lingonborough.com>
            Egmont Koblinger  <egmont@gmail.com>
 

diff --git a/nis/Makefile b/nis/Makefile
index fae30d5da1c5a4e540fe214e061ceb464e055457..01ec4dc3574595b58f86b201e2d25d38b964c07f 100644 (file)
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -68,7 +68,15 @@ libnss_nis-inhibit-o = $(filter-out .os,$(object-suffixes))
 libnss_nisplus-routines        := $(addprefix nisplus-,$(databases)) nisplus-parser \
                           nss-nisplus nisplus-initgroups
 libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
-endif
+
+else # not $(build-obsolete-nsl)
+# Pretend that libnsl.so is a linker script, so that the symbolic link
+# is not installed.
+install-lib-ldscripts = libnsl.so
+$(inst_libdir)/libnsl.so:
+libnsl-inhibit-o = .o # Build no static libnsl.a.
+
+endif # not $(build-obsolete-nsl)
 
 include ../Rules