diff --git a/glibc-rh731833-rtkaio.patch b/glibc-rh731833-rtkaio.patch index c4ae52a..b161739 100644 --- a/glibc-rh731833-rtkaio.patch +++ b/glibc-rh731833-rtkaio.patch @@ -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. $(objpfx)librtkaio.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \ - $(shared-thread-library) \ -- $(if $(filter yes,$(elf)), $(elfobjdir)/ld.so) -+ $(shared-thread-library) $(elfobjdir)/ld.so +- $(if $(filter yes,$(elf)), $(elf-objpfx)ld.so) ++ $(shared-thread-library) $(elf-objpfx)ld.so ifeq (yes,$(build-shared)) $(addprefix $(objpfx),$(tests)): $(objpfx)librtkaio.so $(shared-thread-library) diff --git a/glibc-rtkaio.patch b/glibc-rtkaio.patch index d7f3d6e..033d8b7 100644 --- a/glibc-rtkaio.patch +++ b/glibc-rtkaio.patch @@ -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. +$(objpfx)librtkaio.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \ + $(shared-thread-library) \ -+ $(if $(filter yes,$(elf)), $(elfobjdir)/ld.so) ++ $(if $(filter yes,$(elf)), $(elf-objpfx)ld.so) + +ifeq (yes,$(build-shared)) +$(addprefix $(objpfx),$(tests)): $(objpfx)librtkaio.so $(shared-thread-library) diff --git a/glibc.spec b/glibc.spec index 51c69d0..8dcfc61 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1645,6 +1645,7 @@ rm -f *.filelist* %changelog * Mon May 26 2014 Siddhesh Poyarekar - 2.19.90-18 - Sync with upstream master. +- Adjust rtkaio patches to build with upstream master. * Wed May 21 2014 Kyle McMartin - 2.19.90-17 - Backport some upstream-wards patches to fix TLS issues on AArch64.