summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-14/libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-04-21 13:00:22 +0200
committerRichard Leitner <richard.leitner@skidata.com>2020-11-09 14:29:49 +0100
commitf66b83882e076f339dd89e88165bd7bac121f9ff (patch)
treeca7eafceb9735f4c5cb5d2d574bf94b42d6c29b6 /recipes-core/openjdk/patches-openjdk-14/libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch
parent6e84638d77ac921aac46649095bca5ddbde94d2a (diff)
downloadmeta-java-f66b83882e076f339dd89e88165bd7bac121f9ff.tar.gz
openjdk-14: add 14.0.1g0hl1n/jdk14
Add support for OpenJDK and OpenJRE v14.0.1. This version of OpenJDK is bootstrapped from a host-provided JDK. The host provided JDK is used to build openjdk-14-native. The native build is then used as build-jdk for the cross version. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-14/libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-14/libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-14/libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch b/recipes-core/openjdk/patches-openjdk-14/libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch
new file mode 100644
index 0000000..66d480e
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-14/libj2gss_NativeFunc_multiple_definition_link_errors_with_GCC10.patch
@@ -0,0 +1,49 @@
1
2# HG changeset patch
3# User qpzhang
4# Date 1580905869 -28800
5# Node ID 9e54ea7d9cd9566d28cfcd9269118a1995fc361c
6# Parent 932418820c80a87b77d96ad5f5525d282f00e82e
78238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10
8Summary: Fixed libj2gss link errors caused by GCC10 default -fno-common
9Reviewed-by: weijun
10
11diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.c
12--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 10:45:39 2020 +0100
13+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 20:31:09 2020 +0800
14@@ -1,5 +1,5 @@
15 /*
16- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
17+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
18 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19 *
20 * This code is free software; you can redistribute it and/or modify it
21@@ -27,6 +27,9 @@
22 #include <stdlib.h>
23 #include "NativeFunc.h"
24
25+/* global GSS function table */
26+GSS_FUNCTION_TABLE_PTR ftab;
27+
28 /* standard GSS method names (ordering is from mapfile) */
29 static const char RELEASE_NAME[] = "gss_release_name";
30 static const char IMPORT_NAME[] = "gss_import_name";
31diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.h
32--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 10:45:39 2020 +0100
33+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 20:31:09 2020 +0800
34@@ -1,5 +1,5 @@
35 /*
36- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
37+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
38 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
39 *
40 * This code is free software; you can redistribute it and/or modify it
41@@ -277,6 +277,6 @@
42 typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
43
44 /* global GSS function table */
45-GSS_FUNCTION_TABLE_PTR ftab;
46+extern GSS_FUNCTION_TABLE_PTR ftab;
47
48 #endif
49