glibc40/glibc-fedora-nptl-linklibc.patch
Andrey Bondrov 2bb20c2d90 New version 2.28
Sync patches with OpenMandriva
2019-04-12 16:38:20 +10:00

25 lines
1.1 KiB
Diff

diff -up glibc-2.27.20180720/nptl/Makefile.0034~ glibc-2.27.20180720/nptl/Makefile
--- glibc-2.27.20180720/nptl/Makefile.0034~ 2018-07-20 02:29:28.763982849 +0200
+++ glibc-2.27.20180720/nptl/Makefile 2018-07-20 02:33:04.128058315 +0200
@@ -623,14 +623,18 @@ $(addprefix $(objpfx), \
$(tests) $(tests-internal) $(xtests) $(test-srcs))): \
$(objpfx)libpthread.so
$(objpfx)tst-unload: $(libdl)
-# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
+# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
# since otherwise libpthread.so comes before libc.so when linking.
$(addprefix $(objpfx), $(tests-reverse)): \
- $(objpfx)../libc.so $(objpfx)libpthread.so
-$(objpfx)../libc.so: $(common-objpfx)libc.so ;
+ $(objpfx)linklibc.so $(objpfx)libpthread.so
+$(objpfx)linklibc.so: $(common-objpfx)libc.so ;
$(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
$(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so
+
+$(objpfx)linklibc.so: $(common-objpfx)libc.so
+ ln -s ../libc.so $@
+generated += libclink.so
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif