From 8da75f6fa433d0d50b2315960a7b03973577d2e5 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon, 26 May 2014 15:50:48 +0530
Subject: [PATCH] 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).
---
 glibc-rh731833-rtkaio.patch | 4 ++--
 glibc-rtkaio.patch          | 2 +-
 glibc.spec                  | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

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 <siddhesh@redhat.com> - 2.19.90-18
 - 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
 - Backport some upstream-wards patches to fix TLS issues on AArch64.