From: Adam Duskett Date: Thu, 18 Jun 2020 17:49:55 +0000 (-0700) Subject: package/openjdk: fix building against gcc10 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=316c144e274446707befe349370edf00a49d5d0b;p=buildroot.git package/openjdk: fix building against gcc10 GCC10 set's the -fno-common flag by default which causes OpenJDK to fail when compiling. Because there is no easy way to create a patch from the OpenJDK mercurial repository, this patch was created by hand from the three commits listed in the provided patch itself. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- diff --git a/package/openjdk/11.0.7+10/0001-fix-gcc-10-support.patch b/package/openjdk/11.0.7+10/0001-fix-gcc-10-support.patch new file mode 100644 index 0000000000..9941d0151f --- /dev/null +++ b/package/openjdk/11.0.7+10/0001-fix-gcc-10-support.patch @@ -0,0 +1,119 @@ +From 58911e9de888aece29f491995a8b8a31f7d6b424 Mon Sep 17 00:00:00 2001 +From: Patrick Zhang +Date: Wed, 05 Feb 2020 17:14:15 -0700 +Subject: [PATCH] fix gcc 10 support + +This patch fixes the "multiple definition" link errors with GCC10 due to +GCC10 setting -fno-common by default. + +This is a combination of the following upstream commits: + - https://hg.openjdk.java.net/jdk/jdk/rev/8e6fa89397ca + - https://hg.openjdk.java.net/jdk/jdk/rev/6925fca95959 + - https://hg.openjdk.java.net/jdk/jdk/rev/9e54ea7d9cd9 + +Signed-off-by: Patrick Zhang +Signed-off-by: Adam Duskett +--- + src/java.base/unix/native/libjava/childproc.c | 1 + + src/java.base/unix/native/libjava/childproc.h | 2 +- + .../share/native/libj2gss/NativeFunc.c | 3 +++ + .../share/native/libj2gss/NativeFunc.h | 2 +- + src/jdk.sctp/unix/native/libsctp/Sctp.h | 12 ++++++------ + src/jdk.sctp/unix/native/libsctp/SctpNet.c | 7 +++++++ + 6 files changed, 19 insertions(+), 8 deletions(-) + +diff --git a/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c +index 811aaeac5..16480bfbf 100644 +--- a/src/java.base/unix/native/libjava/childproc.c ++++ b/src/java.base/unix/native/libjava/childproc.c +@@ -33,6 +33,7 @@ + + #include "childproc.h" + ++const char * const *parentPathv; + + ssize_t + restartableWrite(int fd, const void *buf, size_t count) +diff --git a/src/java.base/unix/native/libjava/childproc.h b/src/java.base/unix/native/libjava/childproc.h +index 091150930..d57e44b6e 100644 +--- a/src/java.base/unix/native/libjava/childproc.h ++++ b/src/java.base/unix/native/libjava/childproc.h +@@ -118,7 +118,7 @@ typedef struct _SpawnInfo { + * 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 --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c +index da7bc0445..5941f7b5a 100644 +--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c ++++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c +@@ -27,6 +27,9 @@ + #include + #include "NativeFunc.h" + ++/* global GSS function table */ ++GSS_FUNCTION_TABLE_PTR ftab; ++ + /* standard GSS method names (ordering is from mapfile) */ + static const char RELEASE_NAME[] = "gss_release_name"; + static const char IMPORT_NAME[] = "gss_import_name"; +diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h +index 82914387c..e4a4981a3 100644 +--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h ++++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h +@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE { + 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 --git a/src/jdk.sctp/unix/native/libsctp/Sctp.h b/src/jdk.sctp/unix/native/libsctp/Sctp.h +index cc1367f78..46b07db0a 100644 +--- a/src/jdk.sctp/unix/native/libsctp/Sctp.h ++++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h +@@ -322,12 +322,12 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); + + #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 --git a/src/jdk.sctp/unix/native/libsctp/SctpNet.c b/src/jdk.sctp/unix/native/libsctp/SctpNet.c +index d40c15aa3..ab9b6e093 100644 +--- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c ++++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c +@@ -43,6 +43,13 @@ static jmethodID isaCtrID = 0; + static const char* nativeSctpLib = "libsctp.so.1"; + static jboolean funcsLoaded = JNI_FALSE; + ++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; ++ + JNIEXPORT jint JNICALL DEF_JNI_OnLoad + (JavaVM *vm, void *reserved) { + return JNI_VERSION_1_2; +-- +2.26.2 + diff --git a/package/openjdk/14.0.1+7/0001-fix-gcc-10-support.patch b/package/openjdk/14.0.1+7/0001-fix-gcc-10-support.patch new file mode 100644 index 0000000000..5364c47252 --- /dev/null +++ b/package/openjdk/14.0.1+7/0001-fix-gcc-10-support.patch @@ -0,0 +1,119 @@ +From 58911e9de888aece29f491995a8b8a31f7d6b424 Mon Sep 17 00:00:00 2001 +From: Patrick Zhang +Date: Wed, 05 Feb 2020 17:14:15 -0700 +Subject: [PATCH] fix gcc 10 support + +This patch fixes the "multiple definition" link errors with GCC10 due to +GCC10 setting -fno-common by default. + +This is a combination of the following upstream commits: + - https://hg.openjdk.java.net/jdk/jdk/rev/8e6fa89397ca + - https://hg.openjdk.java.net/jdk/jdk/rev/6925fca95959 + - https://hg.openjdk.java.net/jdk/jdk/rev/9e54ea7d9cd9 + +Signed-off-by: Patrick Zhang +Signed-off-by: Adam Duskett +--- + src/java.base/unix/native/libjava/childproc.c | 1 + + src/java.base/unix/native/libjava/childproc.h | 2 +- + .../share/native/libj2gss/NativeFunc.c | 3 +++ + .../share/native/libj2gss/NativeFunc.h | 2 +- + src/jdk.sctp/unix/native/libsctp/Sctp.h | 12 ++++++------ + src/jdk.sctp/unix/native/libsctp/SctpNet.c | 7 +++++++ + 6 files changed, 19 insertions(+), 8 deletions(-) + +diff --git a/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c +index 811aaeac5..16480bfbf 100644 +--- a/src/java.base/unix/native/libjava/childproc.c ++++ b/src/java.base/unix/native/libjava/childproc.c +@@ -34,6 +34,7 @@ + + #include "childproc.h" + ++const char * const *parentPathv; + + ssize_t + restartableWrite(int fd, const void *buf, size_t count) +diff --git a/src/java.base/unix/native/libjava/childproc.h b/src/java.base/unix/native/libjava/childproc.h +index 091150930..d57e44b6e 100644 +--- a/src/java.base/unix/native/libjava/childproc.h ++++ b/src/java.base/unix/native/libjava/childproc.h +@@ -126,7 +126,7 @@ typedef struct _SpawnInfo { + * 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 --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c +index da7bc0445..5941f7b5a 100644 +--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c ++++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c +@@ -27,6 +27,9 @@ + #include + #include "NativeFunc.h" + ++/* global GSS function table */ ++GSS_FUNCTION_TABLE_PTR ftab; ++ + /* standard GSS method names (ordering is from mapfile) */ + static const char RELEASE_NAME[] = "gss_release_name"; + static const char IMPORT_NAME[] = "gss_import_name"; +diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h +index 82914387c..e4a4981a3 100644 +--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h ++++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h +@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE { + 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 --git a/src/jdk.sctp/unix/native/libsctp/Sctp.h b/src/jdk.sctp/unix/native/libsctp/Sctp.h +index cc1367f78..46b07db0a 100644 +--- a/src/jdk.sctp/unix/native/libsctp/Sctp.h ++++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h +@@ -322,12 +322,12 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); + + #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 --git a/src/jdk.sctp/unix/native/libsctp/SctpNet.c b/src/jdk.sctp/unix/native/libsctp/SctpNet.c +index d40c15aa3..ab9b6e093 100644 +--- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c ++++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c +@@ -43,6 +43,13 @@ static jmethodID isaCtrID = 0; + static const char* nativeSctpLib = "libsctp.so.1"; + static jboolean funcsLoaded = JNI_FALSE; + ++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; ++ + JNIEXPORT jint JNICALL DEF_JNI_OnLoad + (JavaVM *vm, void *reserved) { + return JNI_VERSION_1_2; +-- +2.26.2 +