Accepting request 817216 from Java:Factory

Fix factory build on relevant architectures OBS-URL: https://build.opensuse.org/request/show/817216 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openj9?expand=0&rev=4
2020-06-26 19:49:13 +00:00
parent e0bbb58f38 bce0f78fb9
commit 732b25d02c
4 changed files with 186 additions and 1 deletions
--- a/gcc10.patch
+++ b/gcc10.patch
@@ -0,0 +1,120 @@
+diff -urEbwB openjdk.orig/jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c openjdk/jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c
+--- openjdk.orig/jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c	2020-06-26 09:42:58.999803937 +0200
+++ openjdk/jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c	2020-06-26 09:59:50.543324257 +0200
+@@ -29,6 +29,9 @@
+ #include "jlong.h"
+ #include <jni.h>
+ 
+/* global GSS function table */
+GSS_FUNCTION_TABLE_PTR ftab;
+
+ /* Constants for indicating what type of info is needed for inquiries */
+ const int TYPE_CRED_NAME = 10;
+ const int TYPE_CRED_TIME = 11;
+diff -urEbwB openjdk.orig/jdk/src/solaris/native/java/lang/childproc.c openjdk/jdk/src/solaris/native/java/lang/childproc.c
+--- openjdk.orig/jdk/src/solaris/native/java/lang/childproc.c	2020-06-26 09:42:59.039804239 +0200
+++ openjdk/jdk/src/solaris/native/java/lang/childproc.c	2020-06-26 10:31:35.896900177 +0200
+@@ -33,6 +33,11 @@
+ 
+ #include "childproc.h"
+ 
+/**
+ * The cached and split version of the JDK's effective PATH.
+ * (We don't support putenv("PATH=...") in native code)
+ */
+const char * const *parentPathv;
+ 
+ ssize_t
+ restartableWrite(int fd, const void *buf, size_t count)
+diff -urEbwB openjdk.orig/jdk/src/solaris/native/java/lang/childproc.h openjdk/jdk/src/solaris/native/java/lang/childproc.h
+--- openjdk.orig/jdk/src/solaris/native/java/lang/childproc.h	2020-06-26 09:42:59.039804239 +0200
+++ openjdk/jdk/src/solaris/native/java/lang/childproc.h	2020-06-26 10:29:56.588194377 +0200
+@@ -119,7 +119,7 @@
+  * The cached and split version of the JDK's effective PATH.
+  * (We don't support putenv("PATH=...") in native code)
+  */
+-const char * const *parentPathv;
+extern const char * const *parentPathv;
+ 
+ ssize_t restartableWrite(int fd, const void *buf, size_t count);
+ int restartableDup2(int fd_from, int fd_to);
+diff -urEbwB openjdk.orig/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h
+--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h	2020-06-26 09:42:59.047804301 +0200
+++ openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h	2020-06-26 10:48:28.280138949 +0200
+@@ -322,12 +322,12 @@
+ 
+ #endif /* __linux__ */
+ 
+-sctp_getladdrs_func* nio_sctp_getladdrs;
+-sctp_freeladdrs_func* nio_sctp_freeladdrs;
+-sctp_getpaddrs_func* nio_sctp_getpaddrs;
+-sctp_freepaddrs_func* nio_sctp_freepaddrs;
+-sctp_bindx_func* nio_sctp_bindx;
+-sctp_peeloff_func* nio_sctp_peeloff;
+extern sctp_getladdrs_func* nio_sctp_getladdrs;
+extern sctp_freeladdrs_func* nio_sctp_freeladdrs;
+extern sctp_getpaddrs_func* nio_sctp_getpaddrs;
+extern sctp_freepaddrs_func* nio_sctp_freepaddrs;
+extern sctp_bindx_func* nio_sctp_bindx;
+extern sctp_peeloff_func* nio_sctp_peeloff;
+ 
+ jboolean loadSocketExtensionFuncs(JNIEnv* env);
+ 
+diff -urEbwB openjdk.orig/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c
+--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c	2020-06-26 09:42:59.047804301 +0200
+++ openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c	2020-06-26 10:48:01.103944370 +0200
+@@ -51,6 +51,13 @@
+ static int preCloseFD = -1;     /* File descriptor to which we dup other fd's
+                                    before closing them for real */
+ 
+sctp_getladdrs_func* nio_sctp_getladdrs;
+sctp_freeladdrs_func* nio_sctp_freeladdrs;
+sctp_getpaddrs_func* nio_sctp_getpaddrs;
+sctp_freepaddrs_func* nio_sctp_freepaddrs;
+sctp_bindx_func* nio_sctp_bindx;
+sctp_peeloff_func* nio_sctp_peeloff;
+
+ /**
+  * Loads the native sctp library that contains the socket extension
+  * functions, as well as locating the individual functions.
+diff -urEbwB openjdk.orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h
+--- openjdk.orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h	2020-06-26 09:42:59.047804301 +0200
+++ openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h	2020-06-26 09:43:05.211851045 +0200
+@@ -265,6 +265,6 @@
+ typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
+ 
+ /* global GSS function table */
+-GSS_FUNCTION_TABLE_PTR ftab;
+extern GSS_FUNCTION_TABLE_PTR ftab;
+ 
+ #endif
+diff -urEbwB openjdk.orig/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c openjdk/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c
+--- openjdk.orig/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c	2020-06-26 09:43:37.492095839 +0200
+++ openjdk/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c	2020-06-26 09:41:42.243256411 +0200
+@@ -31,7 +31,7 @@
+ static jvmtiExtensionFunction subscribe  = NULL;
+ static jvmtiExtensionFunction unsubscribe  = NULL;
+ 
+-void *subscriptionID;
+void *subscriptionID1;
+ volatile static jint bufferCount = 0;
+ volatile static int alarmed = 0;
+ 
+@@ -131,7 +131,7 @@
+ 	jvmtiError err;
+ 	jvmtiEnv *jvmti_env = env->jvmtiEnv;
+ 
+-	err = subscribe(jvmti_env, "vgc001 subscriber", vgc001Callback, vgc001Alarm, NULL, &subscriptionID);
+	err = subscribe(jvmti_env, "vgc001 subscriber", vgc001Callback, vgc001Alarm, NULL, &subscriptionID1);
+ 	if (err != JVMTI_ERROR_NONE) {
+ 		error(env, err, "RegisterVerboseGCSubscriber failed");
+ 		return FALSE;
+@@ -147,7 +147,7 @@
+ 	jvmtiError err = JVMTI_ERROR_NONE;
+ 	jvmtiEnv *jvmti_env = env->jvmtiEnv;
+ 
+-	err = unsubscribe(jvmti_env, subscriptionID, NULL);
+	err = unsubscribe(jvmti_env, subscriptionID1, NULL);
+ 	if (err != JVMTI_ERROR_NONE && err != JVMTI_ERROR_NOT_AVAILABLE) {
+ 		error(env, err, "DeregisterVerboseGCSubscriber failed");
+ 		return -1;
--- a/java-1_8_0-openj9.changes
+++ b/java-1_8_0-openj9.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jun 26 09:12:17 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Added patches:
+  * gcc10.patch
+    + Fix dupplicate global pointer variables with gcc 10
+  + openj9-no-werror.patch
+    + Do not build with warnings as errors the OpenJ9 parts, since
+      that would mean broken build with new warnings from gcc 10
+
 -------------------------------------------------------------------
 Fri Apr 24 06:26:21 UTC 2020 - Fridrich Strba <fstrba@suse.com>

--- a/java-1_8_0-openj9.spec
+++ b/java-1_8_0-openj9.spec
@@ -126,7 +126,11 @@ Patch202:       system-libpng.patch
 Patch203:       system-lcms.patch
 Patch205:       link-with-as-needed.patch

+Patch210:       openj9-no-werror.patch
+Patch211:       gcc10.patch
+
 Patch300:       alternative-path-to-tzdb_dat.patch
+
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -153,7 +157,7 @@ BuildRequires:  liblcms2-devel
 BuildRequires:  libnuma-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libxslt
-BuildRequires:  nasm
+BuildRequires:  nasm >= 2.11
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  unzip
@@ -364,6 +368,9 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %patch203 -p1
 %patch205 -p1

+%patch210
+%patch211 -p1
+
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
--- a/openj9-no-werror.patch
+++ b/openj9-no-werror.patch
@@ -0,0 +1,48 @@
+--- openj9/runtime/makelib/targets.mk.linux.inc.ftl	2020-04-15 02:48:00.000000000 +0200
+++ openj9/runtime/makelib/targets.mk.linux.inc.ftl	2020-06-26 07:37:18.255678364 +0200
+@@ -459,18 +459,18 @@
+   ifndef UMA_SUPPRESS_WARNINGS_AS_ERRORS
+     <#if uma.spec.processor.ppc>
+       <#if uma.spec.flags.env_gcc.enabled>
+-        CFLAGS += -Wreturn-type -Werror
+-        CXXFLAGS += -Wreturn-type -Werror
+        CFLAGS += -Wreturn-type
+        CXXFLAGS += -Wreturn-type
+       <#else>
+         CFLAGS += -qhalt=w
+         CXXFLAGS += -qhalt=w
+       </#if>
+       ifdef USE_PPC_GCC
+-        PPC_GCC_CXXFLAGS += -Wreturn-type -Werror
+        PPC_GCC_CXXFLAGS += -Wreturn-type
+       endif
+     <#else>
+-      CFLAGS += -Wimplicit -Wreturn-type -Werror
+-      CXXFLAGS += -Wreturn-type -Werror
+      CFLAGS += -Wimplicit -Wreturn-type
+      CXXFLAGS += -Wreturn-type
+     </#if>
+   endif
+ endif
+--- omr/omrmakefiles/rules.linux.mk	2020-04-14 14:43:05.000000000 +0200
+++ omr/omrmakefiles/rules.linux.mk	2020-06-26 08:19:16.264774446 +0200
+@@ -348,15 +348,15 @@
+ ifeq ($(OMR_WARNINGS_AS_ERRORS),1)
+     ifeq (ppc,$(OMR_HOST_ARCH))
+         ifeq (gcc,$(OMR_TOOLCHAIN))
+-            GLOBAL_CFLAGS += -Wreturn-type -Werror
+-            GLOBAL_CXXFLAGS += -Wreturn-type -Werror
+            GLOBAL_CFLAGS += -Wreturn-type
+            GLOBAL_CXXFLAGS += -Wreturn-type
+         else
+             GLOBAL_CFLAGS += -qhalt=w
+             GLOBAL_CXXFLAGS += -qhalt=w
+         endif
+     else
+-        GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type -Werror
+-        GLOBAL_CXXFLAGS+=-Wreturn-type -Werror
+        GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type
+        GLOBAL_CXXFLAGS+=-Wreturn-type
+     endif
+ endif
+