[java-1.7.0-openjdk] Fix final-location-rpath patch on aarch64

[Omair Majid]

commit b08e0a9f3b25b0dec03c75bbcd57f7c09409526e
Author: Omair Majid <omajid at redhat.com>
Date:   Fri May 23 11:55:01 2014 -0400

    Fix final-location-rpath patch on aarch64

 add-final-location-rpaths-aarch64.patch |   38 +++++++++++++++++++++++++++++++
 java-1.7.0-openjdk.spec                 |   11 ++++++++-
 2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/add-final-location-rpaths-aarch64.patch b/add-final-location-rpaths-aarch64.patch
new file mode 100644
index 0000000..80bedd8
--- /dev/null
+++ b/add-final-location-rpaths-aarch64.patch
@@ -0,0 +1,38 @@
+diff --git openjdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
+--- openjdk/jdk/make/common/Defs-linux.gmk
++++ openjdk/jdk/make/common/Defs-linux.gmk
+@@ -343,8 +343,8 @@
+ 
+   LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
+ 
+-  LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
+-  LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
++  LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)
++  LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)%)
+ 
+ endif
+ 
+diff --git openjdk/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk
+--- openjdk/jdk/make/common/Program.gmk
++++ openjdk/jdk/make/common/Program.gmk
+@@ -110,7 +110,7 @@
+   ifeq ($(PLATFORM), linux)
+     LDFLAGS += $(LDFLAG_Z_ORIGIN)
+     LDFLAGS += -Wl,--allow-shlib-undefined
+-    LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
++    LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)/jli
+   endif # PLATFORM LINUX
+ endif # PLATFORM linux solaris
+ 
+diff --git openjdk/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile
+--- openjdk/jdk/make/java/instrument/Makefile
++++ openjdk/jdk/make/java/instrument/Makefile
+@@ -123,7 +123,7 @@
+   ifeq ($(PLATFORM), linux)
+     LDFLAGS += $(LDFLAG_Z_ORIGIN)
+     LDFLAGS += -Wl,--allow-shlib-undefined
+-    LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
++    LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)/jli
+   endif
+ endif
+ endif
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index a022edd..5a5e04d 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -169,7 +169,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.60
-Release: %{icedtea_version}.0.20.%{icedtea_version_presuffix}%{?dist}
+Release: %{icedtea_version}.0.21.%{icedtea_version_presuffix}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -289,6 +289,7 @@ Patch403: PStack-808293.patch
 Patch4030: PStack-808293-aarch64.patch
 # Add hardcoded RPATHS to ELF files
 Patch412: add-final-location-rpaths.patch
+Patch4120: add-final-location-rpaths-aarch64.patch
 # End of tmp patches
 
 # Temporary copy of RH1064383 fix; remove after release of 2.4.8
@@ -581,7 +582,12 @@ tar xzf %{SOURCE9}
 %patch403
 %endif
 
+%ifarch %{aarch64}
+%patch4120
+%else
 %patch412
+%endif
+
 %patch413
 
 %build
@@ -1572,6 +1578,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Fri May 23 2014 Omair Majid <omajid at redhat.com> - 1.7.0.51-2.5.0.21.f21
+- Added aarch64-specfic version of the add-final-location-rpaths path
+
 * Thu May 22 2014 Jiri Vanek <jvanek at redhat.com> - 1.7.0.51-2.5.0.19.f21
 - python added to line SOURCE14 $files, to prevent access denied
 - debug turned off