You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
2.0 KiB
56 lines
2.0 KiB
commit b53f0c11de409b04560a70570178d1a9d03d5860 |
|
Author: Florian Weimer <fweimer@redhat.com> |
|
Date: Fri Mar 11 08:23:56 2022 +0100 |
|
|
|
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> |
|
(cherry picked from commit aefc79ab5ad4bb9feea2876720cec70dca7cd8ed) |
|
|
|
diff --git a/nss/Makefile b/nss/Makefile |
|
index bccf9f2806c15651..e223243d9d62041c 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 df6603e6992b8382..b87ab50c59af1bfd 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 |
|
|
|
|