Adjust rtkaio patches to build with latest upstream
Following commit upstream removed the definition for elfobjdir in favour of elf-objpfx. Adjust rtkaio to build with this. commit 4134b50d6789c333707b1861a32314805bd0de5e Author: Joseph Myers <joseph@codesourcery.com> Date: Wed May 21 16:52:08 2014 +0000 Consistently use $(elf-objpfx). As previously noted <https://sourceware.org/ml/libc-alpha/2013-05/msg00696.html>, $(elf-objpfx) and $(elfobjdir) are redundant and should be consolidated. This patch consolidates on $(elf-objpfx) (for consistency with $(csu-objpfx)), also changing direct uses of $(common-objpfx)elf/ to use $(elf-objpfx).
This commit is contained in:
parent
8710f4aaa6
commit
8da75f6fa4
|
@ -24,8 +24,8 @@ diff -pruN glibc-2.17-c758a686/rtkaio/Makefile glibc-2.17-c758a686.new/rtkaio/Ma
|
||||||
# a statically-linked program that hasn't already loaded it.
|
# a statically-linked program that hasn't already loaded it.
|
||||||
$(objpfx)librtkaio.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \
|
$(objpfx)librtkaio.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \
|
||||||
- $(shared-thread-library) \
|
- $(shared-thread-library) \
|
||||||
- $(if $(filter yes,$(elf)), $(elfobjdir)/ld.so)
|
- $(if $(filter yes,$(elf)), $(elf-objpfx)ld.so)
|
||||||
+ $(shared-thread-library) $(elfobjdir)/ld.so
|
+ $(shared-thread-library) $(elf-objpfx)ld.so
|
||||||
|
|
||||||
ifeq (yes,$(build-shared))
|
ifeq (yes,$(build-shared))
|
||||||
$(addprefix $(objpfx),$(tests)): $(objpfx)librtkaio.so $(shared-thread-library)
|
$(addprefix $(objpfx),$(tests)): $(objpfx)librtkaio.so $(shared-thread-library)
|
||||||
|
|
|
@ -557,7 +557,7 @@ diff -pruN glibc-2.17-931-g30bbc0c/rtkaio/Makefile glibc-2.17-931-g30bbc0c.new/r
|
||||||
+# a statically-linked program that hasn't already loaded it.
|
+# a statically-linked program that hasn't already loaded it.
|
||||||
+$(objpfx)librtkaio.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \
|
+$(objpfx)librtkaio.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \
|
||||||
+ $(shared-thread-library) \
|
+ $(shared-thread-library) \
|
||||||
+ $(if $(filter yes,$(elf)), $(elfobjdir)/ld.so)
|
+ $(if $(filter yes,$(elf)), $(elf-objpfx)ld.so)
|
||||||
+
|
+
|
||||||
+ifeq (yes,$(build-shared))
|
+ifeq (yes,$(build-shared))
|
||||||
+$(addprefix $(objpfx),$(tests)): $(objpfx)librtkaio.so $(shared-thread-library)
|
+$(addprefix $(objpfx),$(tests)): $(objpfx)librtkaio.so $(shared-thread-library)
|
||||||
|
|
|
@ -1645,6 +1645,7 @@ rm -f *.filelist*
|
||||||
%changelog
|
%changelog
|
||||||
* Mon May 26 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-18
|
* Mon May 26 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-18
|
||||||
- Sync with upstream master.
|
- Sync with upstream master.
|
||||||
|
- Adjust rtkaio patches to build with upstream master.
|
||||||
|
|
||||||
* Wed May 21 2014 Kyle McMartin <kyle@fedoraproject.org> - 2.19.90-17
|
* Wed May 21 2014 Kyle McMartin <kyle@fedoraproject.org> - 2.19.90-17
|
||||||
- Backport some upstream-wards patches to fix TLS issues on AArch64.
|
- Backport some upstream-wards patches to fix TLS issues on AArch64.
|
||||||
|
|
Loading…
Reference in New Issue