[java-1.7.0-openjdk/f20] Added and always applied zero-x32.diff to try to fix arm32 build

jiri vanek jvanek at fedoraproject.org
Fri Jan 17 13:28:32 UTC 2014


commit c2411d6401b7211ae97cbb835b39beb803b1ece2
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Fri Jan 17 14:28:19 2014 +0100

    Added and always applied  zero-x32.diff to try to fix arm32 build

 java-1.7.0-openjdk.spec |    3 +++
 zero-x32.diff           |   10 ++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 31cea5e..082b19f 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -265,6 +265,7 @@ Patch402: gstackbounds.patch
 Patch403: PStack-808293.patch
 Patch410: 1015432.patch
 Patch411: 1029588.patch
+Patch412: zero-x32.diff
 # End of tmp patches
 
 BuildRequires: autoconf
@@ -536,6 +537,7 @@ tar xzf %{SOURCE9}
 
 %patch410
 %patch411
+%patch412
 
 %build
 # How many cpu's do we have?
@@ -1411,6 +1413,7 @@ exit 0
  - make: 
   - always used DISABLE_INTREE_EC,  UNLIMITED_CRYPTO
   - removed arm32 specific DISTRO_PACKAGE_VERSION JDK_UPDATE_VERSION  JDK_BUILD_NUMBER
+- added 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.f20
 - updated to security icedtea 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)"; \


More information about the scm-commits mailing list