From 9a08a366a7e7ddffe62113a9ffe5e50605ea0924 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 12 Jan 2018 08:42:56 +0100 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ nis/Makefile | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6b451ff2c60..eb739177fa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-01-12 Florian Weimer + + [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 Egmont Koblinger diff --git a/nis/Makefile b/nis/Makefile index fae30d5da1c..01ec4dc3574 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 -- 2.47.2