diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2022-05-21 16:50:57 +0200 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-05-24 22:09:35 +0200 |
| commit | c7d1c247d8ea8f87edd6a5012702a3cd10d99d49 (patch) | |
| tree | 26020fd6933d9df818c66aec6cba5fa901d73499 /java/openjdk14/files/patch-changeset-57932 | |
| parent | www/chromium: update to 102.0.5005.61 (diff) | |
cleanup: remove expired versions of OpenJDK (12 through 16)
Adjust ports depending on expired versions of OpenJDK:
- biology/snpeff: 12+ -> 17+
- devel/RStudio: 12 -> 11
- www/closure-compiler: 13 -> 11+
Allow java/openjdk17 to use java/openjdk17-bootstrap on i386
too, this builds just fine on 13.1-i386
Remove jdk12-doc as it is no longer relevant.
Clean up Java version calculations in bsd.java.mk
Reviewed by: jwb, java (glewis)
Differential Revision: https://reviews.freebsd.org/D35280
Diffstat (limited to 'java/openjdk14/files/patch-changeset-57932')
| -rw-r--r-- | java/openjdk14/files/patch-changeset-57932 | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/java/openjdk14/files/patch-changeset-57932 b/java/openjdk14/files/patch-changeset-57932 deleted file mode 100644 index fe176aaa0135..000000000000 --- a/java/openjdk14/files/patch-changeset-57932 +++ /dev/null @@ -1,44 +0,0 @@ -changeset: 57932:9e54ea7d9cd9 -user: qpzhang -date: Wed Feb 05 20:31:09 2020 +0800 -summary: 8238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10 - -diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.c ---- src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 10:45:39 2020 +0100 -+++ src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 20:31:09 2020 +0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -27,6 +27,9 @@ - #include <stdlib.h> - #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 -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.h ---- src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 10:45:39 2020 +0100 -+++ src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 20:31:09 2020 +0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -277,6 +277,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 - |