aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--nis/Makefile10
2 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b451ff..eb73917 100644
--- 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 fae30d5..01ec4dc 100644
--- 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