101 lines
4.2 KiB
Diff
101 lines
4.2 KiB
Diff
commit 2fca4b624bd3ceb8c756b4145c7e96aa032b2b98
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Wed Jun 4 17:44:19 2025 +0200
|
|
|
|
Makefile: Avoid $(objpfx)/ in makefiles
|
|
|
|
If paths with both $(objpfx)/ and $(objpfx) (which already includes
|
|
a trailing slash) appear during the build, this can trigger unexpected
|
|
rebuilds, or incorrect concurrent rebuilds.
|
|
|
|
Conflicts:
|
|
elf/Makefile: Test differences.
|
|
nss/Makefile: Test differences.
|
|
|
|
diff --git a/elf/Makefile b/elf/Makefile
|
|
index 38976f195a398abf..d09f5482c089f18c 100644
|
|
--- a/elf/Makefile
|
|
+++ b/elf/Makefile
|
|
@@ -1055,8 +1055,8 @@ $(objpfx)$(1).generated-makefile: $(1)
|
|
endef
|
|
endif
|
|
|
|
-postclean-generated += $(objpfx)/dso-sort-tests-2.generated-makefile \
|
|
- $(objpfx)/dso-sort-tests-2.generated-makefile
|
|
+postclean-generated += $(objpfx)dso-sort-tests-2.generated-makefile \
|
|
+ $(objpfx)dso-sort-tests-2.generated-makefile
|
|
|
|
# Generate from each testcase description file
|
|
ifeq (yes,$(have-tunables))
|
|
@@ -2674,7 +2674,7 @@ $(objpfx)tst-tls21: $(libdl) $(shared-thread-library)
|
|
$(objpfx)tst-tls21.out: $(objpfx)tst-tls21mod.so
|
|
$(objpfx)tst-tls21mod.so: $(tst-tls-many-dynamic-modules:%=$(objpfx)%.so)
|
|
|
|
-$(objpfx)tst-rtld-run-static.out: $(objpfx)/ldconfig
|
|
+$(objpfx)tst-rtld-run-static.out: $(objpfx)ldconfig
|
|
|
|
$(objpfx)tst-dlmopen-gethostbyname: $(libdl)
|
|
$(objpfx)tst-dlmopen-gethostbyname.out: $(objpfx)tst-dlmopen-gethostbyname-mod.so
|
|
diff --git a/nss/Makefile b/nss/Makefile
|
|
index 4ee8b1eefd792062..05fcadf60fd0d771 100644
|
|
--- a/nss/Makefile
|
|
+++ b/nss/Makefile
|
|
@@ -172,36 +172,36 @@ libof-nss_test1 = extramodules
|
|
libof-nss_test2 = extramodules
|
|
libof-nss_test_errno = extramodules
|
|
libof-nss_test_gai_hv2_canonname = extramodules
|
|
-$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
|
|
+$(objpfx)libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
|
|
$(build-module)
|
|
-$(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps)
|
|
+$(objpfx)libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps)
|
|
$(build-module)
|
|
-$(objpfx)/libnss_test_errno.so: $(objpfx)nss_test_errno.os $(link-libc-deps)
|
|
+$(objpfx)libnss_test_errno.so: $(objpfx)nss_test_errno.os $(link-libc-deps)
|
|
$(build-module)
|
|
-$(objpfx)/libnss_test_gai_hv2_canonname.so: \
|
|
+$(objpfx)libnss_test_gai_hv2_canonname.so: \
|
|
$(objpfx)nss_test_gai_hv2_canonname.os $(link-libc-deps) \
|
|
- $(objpfx)/libnss_files.so
|
|
+ $(objpfx)libnss_files.so
|
|
$(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
|
|
+$(objpfx)libnss_test1.so$(libnss_test1.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_test2.so-version): $(objpfx)libnss_test2.so
|
|
$(make-link)
|
|
endif
|
|
-$(objpfx)/libnss_test_errno.so$(libnss_files.so-version): \
|
|
- $(objpfx)/libnss_test_errno.so
|
|
+$(objpfx)libnss_test_errno.so$(libnss_files.so-version): \
|
|
+ $(objpfx)libnss_test_errno.so
|
|
$(make-link)
|
|
-$(objpfx)/libnss_test_gai_hv2_canonname.so$(libnss_files.so-version): \
|
|
- $(objpfx)/libnss_test_gai_hv2_canonname.so
|
|
+$(objpfx)libnss_test_gai_hv2_canonname.so$(libnss_files.so-version): \
|
|
+ $(objpfx)libnss_test_gai_hv2_canonname.so
|
|
$(make-link)
|
|
$(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \
|
|
- $(objpfx)/libnss_test1.so$(libnss_test1.so-version) \
|
|
- $(objpfx)/libnss_test2.so$(libnss_test2.so-version) \
|
|
- $(objpfx)/libnss_test_errno.so$(libnss_files.so-version) \
|
|
- $(objpfx)/libnss_test_gai_hv2_canonname.so$(libnss_files.so-version)
|
|
+ $(objpfx)libnss_test1.so$(libnss_test1.so-version) \
|
|
+ $(objpfx)libnss_test2.so$(libnss_test2.so-version) \
|
|
+ $(objpfx)libnss_test_errno.so$(libnss_files.so-version) \
|
|
+ $(objpfx)libnss_test_gai_hv2_canonname.so$(libnss_files.so-version)
|
|
|
|
ifeq (yes,$(have-thread-library))
|
|
$(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library)
|
|
@@ -211,4 +211,4 @@ $(objpfx)tst-nss-files-hosts-erange: $(libdl)
|
|
$(objpfx)tst-nss-files-hosts-multi: $(libdl)
|
|
$(objpfx)tst-nss-files-hosts-getent: $(libdl)
|
|
$(objpfx)tst-nss-files-alias-leak: $(libdl)
|
|
-$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so
|
|
+$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)libnss_files.so
|