[java-1.7.0-openjdk/f19] added zero fix for alternative arches - patch412 zero-x32.diff to try to fix zero builds build

[jiri vanek]

commit 7c48fbac16289ecf67cc76bb9ae6af20dd8ac1af
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Fri Jan 17 17:20:52 2014 +0100

    added zero fix for alternative arches
     - patch412 zero-x32.diff to try to fix zero builds build

 java-1.7.0-openjdk.spec |    8 +++++++-
 zero-x32.diff           |   10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index df49747..934f0b1 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -149,7 +149,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.60
-Release: %{icedtea_version}.0%{?dist}
+Release: %{icedtea_version}.1%{?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
@@ -263,6 +263,7 @@ Patch402: gstackbounds.patch
 Patch403: PStack-808293.patch
 Patch410: 1015432.patch
 Patch411: 1029588.patch
+Patch412: zero-x32.diff
 # End of tmp patches
 
 BuildRequires: autoconf
@@ -515,6 +516,7 @@ tar xzf %{SOURCE9}
 
 %patch410
 %patch411
+%patch412
 
 %build
 # How many cpu's do we have?
@@ -1312,6 +1314,10 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Fri Jan 17 2014 Jiri Vanek <jvanek at redhat.com> - 1.7.0.51-2.4.4.1.f19
+- added zero fix for alternative arches
+ - patch412 zero-x32.diff to try to fix zero builds build
+
 * Fri Jan 10 2014 Jiri Vanek <jvanek at redhat.com> - 1.7.0.51-2.4.4.0.f19
 - updated to security icedtea 2.4.4
  - icedtea_version set to 2.4.4
diff --git a/zero-x32.diff b/zero-x32.diff
new file mode 100644
index 0000000..10f911f
--- /dev/null
+++ b/zero-x32.diff
@@ -0,0 +1,10 @@
+--- openjdk/hotspot/make/linux/makefiles/buildtree.make~	2014-01-17 07:01:20.584904000 -0500
++++ openjdk/hotspot/make/linux/makefiles/buildtree.make	2014-01-17 08:01:29.114904000 -0500
+@@ -211,6 +211,7 @@
+ 	echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+ 	echo "OPENJDK = $(OPENJDK)"; \
+ 	echo "ZERO_BUILD = $(ZERO_BUILD)"; \
++	echo "JVM_VARIANT_ZERO = $(JVM_VARIANT_ZERO)"; \
+ 	echo; \
+ 	echo "# Used for platform dispatching"; \
+ 	echo "TARGET_DEFINES  = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \