summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Shebs <stanshebs@google.com>2020-11-03 13:30:16 -0800
committerFangrui Song <i@maskray.me>2021-08-27 17:26:05 -0700
commitbd1e10723b0096d493ed0a4678834c5358bcabd7 (patch)
treecdaf51205a12849cdead7bca95becf7fbed2894c
parent87ac253d003ccd08b76c2984d39089374777bb0e (diff)
downloadglibc-bd1e10723b0096d493ed0a4678834c5358bcabd7.tar.gz
Update build process to create libnsl stub
-rw-r--r--Makeconfig2
-rw-r--r--google-nsl-stub/shlib-versions2
-rw-r--r--nis/Makefile3
3 files changed, 4 insertions, 3 deletions
diff --git a/Makeconfig b/Makeconfig
index f5cd92014f..c1a395a105 100644
--- 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 ca13c8c1f6..1c88e0caa8 100644
--- 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 d77c6e0c8e..1f8f153ed4 100644
--- 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