diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-03-11 08:23:56 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-03-11 08:24:04 +0100 |
| commit | aefc79ab5ad4bb9feea2876720cec70dca7cd8ed (patch) | |
| tree | 942fd79aa9c14793d9f00a63896d83fc09950c27 | |
| parent | d653fd2d9ebe23c2b16b76edf717c5dbd5ce9b77 (diff) | |
| download | glibc-aefc79ab5ad4bb9feea2876720cec70dca7cd8ed.tar.gz glibc-aefc79ab5ad4bb9feea2876720cec70dca7cd8ed.tar.xz glibc-aefc79ab5ad4bb9feea2876720cec70dca7cd8ed.zip | |
nss: Do not mention NSS test modules in <gnu/lib-names.h>
They are not actually installed. Use the nss_files version instead in nss/Makefile, similar to how __nss_shlib_revision is derived from LIBNSS_FILES_SO. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
| -rw-r--r-- | nss/Makefile | 13 | ||||
| -rw-r--r-- | shlib-versions | 5 |
2 files changed, 5 insertions, 13 deletions
diff --git a/nss/Makefile b/nss/Makefile index 552e5d03e1..74e2c2426c 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -171,17 +171,14 @@ $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps) $(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps) $(build-module) $(objpfx)nss_test2.os : nss_test1.c -ifdef libnss_test1.so-version -$(objpfx)/libnss_test1.so$(libnss_test1.so-version): $(objpfx)/libnss_test1.so +# Use the nss_files suffix for these objects as well. +$(objpfx)/libnss_test1.so$(libnss_files.so-version): $(objpfx)/libnss_test1.so $(make-link) -endif -ifdef libnss_test2.so-version -$(objpfx)/libnss_test2.so$(libnss_test2.so-version): $(objpfx)/libnss_test2.so +$(objpfx)/libnss_test2.so$(libnss_files.so-version): $(objpfx)/libnss_test2.so $(make-link) -endif $(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \ - $(objpfx)/libnss_test1.so$(libnss_test1.so-version) \ - $(objpfx)/libnss_test2.so$(libnss_test2.so-version) + $(objpfx)/libnss_test1.so$(libnss_files.so-version) \ + $(objpfx)/libnss_test2.so$(libnss_files.so-version) ifeq (yes,$(have-thread-library)) $(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library) diff --git a/shlib-versions b/shlib-versions index df6603e699..b87ab50c59 100644 --- a/shlib-versions +++ b/shlib-versions @@ -47,11 +47,6 @@ libnss_ldap=2 libnss_hesiod=2 libnss_db=2 -# Tests for NSS. They must have the same NSS_SHLIB_REVISION number as -# the rest. -libnss_test1=2 -libnss_test2=2 - # Version for libnsl with YP and NIS+ functions. libnsl=1 |