Disable libnss_db and libnss_nis{,plus} libnss_compat

diff --git a/README.google b/README.google
index 80a94abee95c1172ae3883f4c9efdfad8e223b3c..220d55ae5d14cc2357eeff18ab7a680d635e9e4f 100644 (file)
--- a/README.google
+++ b/README.google
@@ -59,3 +59,10 @@ nss/nss_cache/nss_cache.c
 nss/nss_cache/nss_cache.h
   Forward-port nss_borg and nss_cache from glibc-2.18
   (ppluzhnikov, google-local)
+
+nis/Makefile
+nss/Makefile
+  For b/2476399, disable libnss_db (not used in google).
+  Likewise ibnsl and related libnss_* libraries.
+  Forward-ported from cl/52538169 and cl/52538711.
+  (ppluzhnikov, bmoses, google-local)

diff --git a/nis/Makefile b/nis/Makefile
index 15f86baaa96d8e6145bbc78511c9ee293c494472..fa411c546189f5afb0c87b80482285a9bb3d8d3a 100644 (file)
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -34,9 +34,12 @@ databases            = proto service hosts network grp pwd rpc ethers \
                          spwd netgrp alias publickey
 
 # Specify rules for the nss_* modules.
-services               := nis nisplus compat
 
-extra-libs             = libnsl $(services:%=libnss_%)
+# Google-local: Disable NIS.
+# services             := nis nisplus compat
+#
+# extra-libs           = libnsl $(services:%=libnss_%)
+
 # These libraries will be built in the `others' pass rather than
 # the `lib' pass, because they depend on libc.so being built already.
 extra-libs-others      = $(extra-libs)

diff --git a/nss/Makefile b/nss/Makefile
index 5f7cb314c84273246ff1743c3f2d0663a5660bfb..69b1f80f80f60d73faa6306ab85114ffc16ee54d 100644 (file)
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -32,8 +32,9 @@ routines              = nsswitch getnssent getnssent_r digits_dots \
 databases              = proto service hosts network grp pwd rpc ethers \
                          spwd netgrp key alias sgrp
 
-others                  := getent makedb
-install-bin             := getent makedb
+# Google-local: Disable libnss_db by removing makedb.
+others                  := getent
+install-bin             := getent
 makedb-modules = xmalloc hash-string
 extra-objs             += $(makedb-modules:=.o)
 
@@ -43,7 +44,8 @@ xtests                        = bug-erange
 include ../Makeconfig
 
 # Specify rules for the nss_* modules.  We have some services.
-services               := files db borg cache
+# Google-local: Disable libnss_db by removing db.
+services               := files borg cache
 
 extra-libs             = $(services:%=libnss_%)
 # These libraries will be built in the `others' pass rather than
@@ -68,7 +70,8 @@ libnss_db-routines    := $(libnss_db-dbs) db-open db-init hash-string
 generated              += $(filter-out db-alias.c db-netgrp.c, \
                                        $(addsuffix .c,$(libnss_db-dbs)))
 
-install-others         += $(inst_vardbdir)/Makefile
+# Google-local: Disable libnss_db.
+# install-others               += $(inst_vardbdir)/Makefile
 
 # Build static module into libc if requested
 libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes))