Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package java-11-openjdk for openSUSE:Factory
checked in at 2021-08-28 22:28:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-11-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-11-openjdk.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openjdk"
Sat Aug 28 22:28:51 2021 rev:47 rq:914407 version:11.0.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-11-openjdk/java-11-openjdk.changes
2021-07-22 22:43:34.567182940 +0200
+++
/work/SRC/openSUSE:Factory/.java-11-openjdk.new.1899/java-11-openjdk.changes
2021-08-28 22:29:00.525967907 +0200
@@ -1,0 +2,12 @@
+Thu Aug 26 13:45:59 UTC 2021 - Fridrich Strba <[email protected]>
+
+- Added patch:
+ * jdk11-glibc234.patch
+ + fix build with glibc-2.34 (bsc#1189201)
+
+-------------------------------------------------------------------
+Wed Aug 4 09:52:59 UTC 2021 - Andreas Schwab <[email protected]>
+
+- riscv64-zero.patch: Add support for riscv64 (zero VM)
+
+-------------------------------------------------------------------
New:
----
jdk11-glibc234.patch
riscv64-zero.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-11-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.pT4KMe/_old 2021-08-28 22:29:02.233969679 +0200
+++ /var/tmp/diff_new_pack.pT4KMe/_new 2021-08-28 22:29:02.237969683 +0200
@@ -62,7 +62,7 @@
%global jaxb_ri_repository jaxb-v2
%global jaxb_ri_tag 2.3.1
# priority must be 6 digits in total
-%if 0%{?suse_version} <= 1315
+%if 0%{?suse_version} <= 1315 && ! 0%{?java_bootstrap}
%global priority 0
%else
%global priority 2105
@@ -232,6 +232,7 @@
#
Patch200: ppc_stack_overflow_fix.patch
Patch201: fix_armv6_build.patch
+Patch202: jdk11-glibc234.patch
#
Patch302: disable-doclint-by-default.patch
Patch303: alternative-tzdb_dat.patch
@@ -242,6 +243,8 @@
#
Patch500: activation-module.patch
Patch501: annotation-module.patch
+#
+Patch600: riscv64-zero.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -286,7 +289,7 @@
Requires: %{name}-headless = %{version}-%{release}
Requires: fontconfig
Requires(post): file
-%if 0%{?suse_version} > 1315
+%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap}
# Standard JPackage base provides.
Provides: java = %{javaver}
Provides: java-%{javaver} = %{version}-%{release}
@@ -316,12 +319,16 @@
Provides: jre1.9.x
Obsoletes: java-10-openjdk < %{version}-%{release}
%endif
-%if %{bootcycle} && 0%{?suse_version} > 1315
+%if %{bootcycle}
+%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap}
BuildRequires: java-devel >= 10
BuildConflicts: java-devel >= 12
%else
BuildRequires: %{name}-devel
%endif
+%else
+BuildRequires: %{name}-devel
+%endif
# Zero-assembler build requirement.
%if %{with zero}
BuildRequires: libffi-devel
@@ -363,7 +370,7 @@
# Postun requires update-alternatives to uninstall tool update-alternatives.
Requires(postun):update-alternatives
Recommends: tzdata-java8
-%if 0%{?suse_version} > 1315
+%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap}
# Standard JPackage base provides.
Provides: java-%{javaver}-headless = %{version}-%{release}
Provides: java-headless = %{javaver}
@@ -399,7 +406,7 @@
Requires(post): update-alternatives
# Postun requires update-alternatives to uninstall tool update-alternatives.
Requires(postun):update-alternatives
-%if 0%{?suse_version} > 1315
+%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap}
# Standard JPackage devel provides.
Provides: java-%{javaver}-devel = %{version}
Provides: java-10-openjdk-devel = %{version}-%{release}
@@ -419,7 +426,7 @@
Summary: JMods for OpenJDK %{featurever}
Group: Development/Languages/Java
Requires: %{name}-devel = %{version}-%{release}
-%if 0%{?suse_version} > 1315
+%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap}
Provides: java-10-openjdk-jmods = %{version}-%{release}
Obsoletes: java-10-openjdk-jmods < %{version}-%{release}
%endif
@@ -431,7 +438,7 @@
Summary: OpenJDK %{featurever} Demos
Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
-%if 0%{?suse_version} > 1315
+%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap}
Provides: java-10-openjdk-demo = %{version}-%{release}
Obsoletes: java-10-openjdk-demo < %{version}-%{release}
%endif
@@ -443,7 +450,7 @@
Summary: OpenJDK %{featurever} Source Bundle
Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
-%if 0%{?suse_version} > 1315
+%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap}
Provides: java-10-openjdk-src = %{version}-%{release}
Obsoletes: java-10-openjdk-src < %{version}-%{release}
%endif
@@ -459,7 +466,7 @@
Requires(post): update-alternatives
# Postun requires update-alternatives to uninstall javadoc alternative.
Requires(postun):update-alternatives
-%if 0%{?suse_version} > 1315
+%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap}
# Standard JPackage javadoc provides.
Provides: java-%{javaver}-javadoc = %{version}-%{release}
Provides: java-10-openjdk-javadoc = %{version}-%{release}
@@ -476,7 +483,7 @@
Group: Development/Languages/Java
Requires: %{name} = %{version}-%{release}
Requires: xprop
-%if 0%{?suse_version} > 1315
+%if 0%{?suse_version} > 1315 || 0%{?java_bootstrap}
Provides: java-10-openjdk-accessibility = %{version}-%{release}
Obsoletes: java-10-openjdk-accessibility < %{version}-%{release}
%endif
@@ -556,6 +563,8 @@
%patch201
%endif
+%patch202 -p1
+
%patch302 -p1
%patch303 -p1
@@ -566,6 +575,8 @@
%patch500
%patch501
+%patch600 -p1
+
# Extract systemtap tapsets
%if %{with_systemtap}
++++++ jdk11-glibc234.patch ++++++
--- jdk11u/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
2021-04-09 11:36:58.000000000 +0200
+++ jdk11u/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
2021-08-26 15:42:52.326232581 +0200
@@ -67,8 +67,17 @@
longjmp(context, 1);
}
+static char* altstack = NULL;
+
void set_signal_handler() {
- static char altstack[SIGSTKSZ];
+ if (altstack == NULL) {
+ // Dynamically allocated in case SIGSTKSZ is not constant
+ altstack = malloc(SIGSTKSZ);
+ if (altstack == NULL) {
+ fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n");
+ exit(7);
+ }
+ }
stack_t ss = {
.ss_size = SIGSTKSZ,
++++++ riscv64-zero.patch ++++++
Index: jdk11u-f412f2537f15/make/autoconf/platform.m4
===================================================================
--- jdk11u-f412f2537f15.orig/make/autoconf/platform.m4
+++ jdk11u-f412f2537f15/make/autoconf/platform.m4
@@ -150,6 +150,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=big
;;
+ riscv64)
+ VAR_CPU=riscv64
+ VAR_CPU_ARCH=riscv
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
+ ;;
*)
AC_MSG_ERROR([unsupported cpu $1])
;;
@@ -473,6 +479,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HEL
HOTSPOT_$1_CPU_DEFINE=S390
elif test "x$OPENJDK_$1_CPU" = xs390x; then
HOTSPOT_$1_CPU_DEFINE=S390
+ elif test "x$OPENJDK_$1_CPU" = xriscv64; then
+ HOTSPOT_$1_CPU_DEFINE=RISCV
elif test "x$OPENJDK_$1_CPU" != x; then
HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
fi
Index: jdk11u-f412f2537f15/src/hotspot/os/linux/os_linux.cpp
===================================================================
--- jdk11u-f412f2537f15.orig/src/hotspot/os/linux/os_linux.cpp
+++ jdk11u-f412f2537f15/src/hotspot/os/linux/os_linux.cpp
@@ -1828,6 +1828,9 @@ void * os::dll_load(const char *filename
#ifndef EM_AARCH64
#define EM_AARCH64 183 /* ARM AARCH64 */
#endif
+#ifndef EM_RISCV
+ #define EM_RISCV 243 /* RISC-V */
+#endif
static const arch_t arch_array[]={
{EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
@@ -1853,6 +1856,7 @@ void * os::dll_load(const char *filename
{EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
{EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
{EM_AARCH64, EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"},
+ {EM_RISCV, EM_RISCV, ELFCLASS64, ELFDATA2LSB, (char*)"RISCV"},
};
#if (defined IA32)
@@ -1887,6 +1891,8 @@ void * os::dll_load(const char *filename
static Elf32_Half running_arch_code=EM_68K;
#elif (defined SH)
static Elf32_Half running_arch_code=EM_SH;
+#elif (defined RISCV)
+ static Elf32_Half running_arch_code=EM_RISCV;
#else
#error Method os::dll_load requires that one of following is defined:\
AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC,
__powerpc__, __powerpc64__, S390, SH, __sparc
