Hello community,
here is the log from the commit of package java-1_8_0-openjdk for
openSUSE:Factory checked in at 2016-10-01 23:51:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_8_0-openjdk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes
2016-08-06 20:38:08.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes
2016-10-01 23:51:32.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 21 09:50:30 UTC 2016 - [email protected]
+
+- Added patch:
+ * s390-java-opts.patch
+ - Solve memory issues when building s390 version
+
+-------------------------------------------------------------------
New:
----
s390-java-opts.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_8_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.s2DFZL/_old 2016-10-01 23:51:35.000000000 +0200
+++ /var/tmp/diff_new_pack.s2DFZL/_new 2016-10-01 23:51:35.000000000 +0200
@@ -181,6 +181,8 @@
#
# Patch for PPC
Patch103: ppc-zero-hotspot.patch
+# Patch for S390
+Patch104: s390-java-opts.patch
Patch1000: icedtea-3.0.1-sunec.patch
Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch
Patch2000: java-1_8_0-openjdk-gcc6.patch
@@ -494,6 +496,11 @@
patch -p0 -i %{PATCH103}
%endif
+%ifarch s390
+# S390 memory issues
+patch -p0 -i %{PATCH104}
+%endif
+
patch -p0 -i %{PATCH2000}
patch -p0 -i %{PATCH2001}
++++++ s390-java-opts.patch ++++++
--- openjdk/common/autoconf/boot-jdk.m4 2016-07-26 12:28:03.054552831 +0200
+++ openjdk/common/autoconf/boot-jdk.m4 2016-07-26 12:30:34.651143737 +0200
@@ -351,29 +351,29 @@
AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
# Starting amount of heap memory.
- if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
+ # if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])
- else
- ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
- fi
+ # else
+ # ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
+ # fi
# Maximum amount of heap memory.
# Maximum stack size.
- if test "x$BOOT_JDK_BITS" = x32; then
- if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
+ # if test "x$BOOT_JDK_BITS" = x32; then
+ # if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
JVM_MAX_HEAP=768M
- else
- JVM_MAX_HEAP=1100M
- fi
+ # else
+ # JVM_MAX_HEAP=1100M
+ # fi
STACK_SIZE=768
- else
+ # else
# Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
# pointers are used. Apparently, we need to increase the heap and stack
# space for the jvm. More specifically, when running javac to build huge
# jdk batch
- JVM_MAX_HEAP=1600M
- STACK_SIZE=1536
- fi
+ # JVM_MAX_HEAP=1600M
+ # STACK_SIZE=1536
+ # fi
ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA])
ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA])
