[java-1.8.0-openjdk] Create jvm.cfg for zero on 32-bit architectures
Omair Majid
omajid at fedoraproject.org
Wed Aug 7 04:29:14 UTC 2013
commit 5a7106153327c0702c2ad2b82a93bb4754e8584e
Author: Omair Majid <omajid at redhat.com>
Date: Wed Aug 7 00:22:24 2013 -0400
Create jvm.cfg for zero on 32-bit architectures
fix-jvm-cfg.patch | 32 ++++++++++++++++++++++++++++++++
java-1.8.0-openjdk.spec | 7 +++++++
2 files changed, 39 insertions(+), 0 deletions(-)
---
diff --git a/fix-jvm-cfg.patch b/fix-jvm-cfg.patch
new file mode 100644
index 0000000..d07a44c
--- /dev/null
+++ b/fix-jvm-cfg.patch
@@ -0,0 +1,32 @@
+--- openjdk/jdk/makefiles/CopyFiles.gmk.orig 2013-08-06 12:47:30.000000000 -0400
++++ openjdk/jdk/makefiles/CopyFiles.gmk 2013-08-06 13:19:21.000000000 -0400
+@@ -302,7 +302,7 @@
+ # The main problem is deciding whether to use aliases for the VMs that are not
+ # present and the current position is that we add aliases for client and server, but
+ # not for minimal.
+- # To do: should this also support, -zero and -zeroshark?
++ # To do: should this also support -zeroshark?
+
+ CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT)))
+
+@@ -335,6 +335,11 @@
+ $(PRINTF) "-minimal KNOWN\n">>$(@)
+ $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
+ $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
++ else
++ ifeq ($(JVM_VARIANT_ZERO),true)
++ $(PRINTF) "-server KNOWN\n">>$(@)
++ $(PRINTF) "-client IGNORED\n">>$(@)
++ endif
+ endif
+ endif
+ endif
+@@ -346,6 +351,8 @@
+ $(call install-file)
+ endif
+
++
++
+ COPY_FILES += $(JVMCFG)
+
+ ##########################################################################################
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index f0d0780..8532306 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -214,6 +214,7 @@ Patch2031: system-lcmsAARCH64.patch
Patch301: removeMswitchesFromx11.patch
Patch302: %{name}-arm64-missing-includes.patch
+Patch310: fix-jvm-cfg.patch
# To apply 8011366-jdk.patch below, aarch64-port-custom changes need to be rolled back
Patch303: 73799ba02d7f.patch
@@ -399,6 +400,9 @@ sh %{SOURCE12}
%patch203
%endif
+pushd jdk8
+%patch310 -p1
+popd
%patch1
@@ -970,6 +974,9 @@ exit 0
%doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
%changelog
+* Tue Aug 06 2013 Omair Majid <omajid at redhat.com> - 1:1.8.0.0-0.16.b89x
+- Add patch to fix zero on 32-bit build
+
* Mon Aug 05 2013 Omair Majid <omajid at redhat.com> - 1:1.8.0.0-0.16.b89x
- Added additional build fixes for aarch64
More information about the scm-commits
mailing list