Update build process to create libnsl stub

diff --git a/Makeconfig b/Makeconfig
index f5cd92014f19a598f8d0de3a20e2a3715c11e566..c1a395a105fb702cf64c33b7d44f0d8b6c4be8fc 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -1248,7 +1248,7 @@ all-subdirs = csu assert ctype locale intl catgets math setjmp signal         \
              grp pwd posix io termios resource misc socket sysvipc gmon    \
              gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
              crypt localedata timezone rt conform debug mathvec support    \
-             dlfcn elf
+             dlfcn elf google-nsl-stub
 
 ifndef avoid-generated
 # sysd-sorted itself will contain rules making the sysd-sorted target

diff --git a/google-nsl-stub/shlib-versions b/google-nsl-stub/shlib-versions
index ca13c8c1f60018da276a0011676d15e73f7d7681..1c88e0caa8213afb0ac49998af0651a2c3c270cc 100644 (file)
--- a/google-nsl-stub/shlib-versions
+++ b/google-nsl-stub/shlib-versions
@@ -1 +1 @@
-.*-.*-.*       libnsl=1
+libnsl=1

diff --git a/nis/Makefile b/nis/Makefile
index d77c6e0c8e5c1ea431838570482a5d12265f6c02..1f8f153ed405e4dc477325fc7f85a6fe4c9adc86 100644 (file)
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -34,7 +34,8 @@ databases             = proto service hosts network grp pwd rpc ethers \
 services               := nis nisplus
 endif
 
-extra-libs             = libnsl
+# Suppress regular libnsl build in favor of the stub in google-nsl-stub.
+#extra-libs            = libnsl
 ifeq ($(build-obsolete-nsl),yes)
 extra-libs += $(services:%=libnss_%)
 endif