rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Create jvm.cfg for zero on 32-bit architectures

Browse Source
This commit is contained in:
Omair Majid 2013-08-07 00:22:24 -04:00
parent 7b61113351
commit 5a71061533
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fix-jvm-cfg.patch Normal file
View File

@ -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)
##########################################################################################

7
java-1.8.0-openjdk.spec
View File

@ -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@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@redhat.com> - 1:1.8.0.0-0.16.b89x
- Added additional build fixes for aarch64