From c7d1c247d8ea8f87edd6a5012702a3cd10d99d49 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Sat, 21 May 2022 16:50:57 +0200 Subject: 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 --- java/openjdk12/files/patch-changeset-57994 | 43 ------------------------------ 1 file changed, 43 deletions(-) delete mode 100644 java/openjdk12/files/patch-changeset-57994 (limited to 'java/openjdk12/files/patch-changeset-57994') diff --git a/java/openjdk12/files/patch-changeset-57994 b/java/openjdk12/files/patch-changeset-57994 deleted file mode 100644 index 8e6dc348c532..000000000000 --- a/java/openjdk12/files/patch-changeset-57994 +++ /dev/null @@ -1,43 +0,0 @@ -changeset: 57994:6925fca95959 -user: qpzhang -date: Tue Feb 04 21:27:10 2020 +0800 -summary: 8238380: java.base/unix/native/libjava/childproc.c "multiple definition" link errors with GCC10 - -diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.c ---- src/java.base/unix/native/libjava/childproc.c Tue Feb 11 11:17:37 2020 +0800 -+++ src/java.base/unix/native/libjava/childproc.c Tue Feb 04 21:27:10 2020 +0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2013, 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 -@@ -34,6 +34,7 @@ - - #include "childproc.h" - -+const char * const *parentPathv; - - ssize_t - restartableWrite(int fd, const void *buf, size_t count) -diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.h ---- src/java.base/unix/native/libjava/childproc.h Tue Feb 11 11:17:37 2020 +0800 -+++ src/java.base/unix/native/libjava/childproc.h Tue Feb 04 21:27:10 2020 +0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2013, 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 -@@ -126,7 +126,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); - -- cgit v1.2.3