diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2022-08-06 12:54:52 +0200 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2022-08-06 12:55:32 +0200 |
| commit | 591a784f324b7d8c45596d758b4c0893626bdbef (patch) | |
| tree | 0f5dfb2b7ed371809837f5d782744e47989dead0 | |
| parent | [NEW] net/py-cepa: Python controller library for Tor (diff) | |
java/openjdk{8,11}: Remove dependency on devel/llvm12 which is no longer necessary
The workarounds committed in aa1ca89826b5 and 846ff4e95291 are no longer
necessary, as both the upstream commits for PR258954
(https://github.com/battleblow/jdk11u/commit/305a68a90c722aa7a7b75589e24d5b5d554c96c1)
and PR264065 (https://hg.openjdk.java.net/jdk/jdk/rev/40c07de877ab) are
now merged into the distribution tarballs.
PR: 258954, 264065
Approved by: maintainer timeout (1 month)
MFH: 2022Q3
| -rw-r--r-- | java/openjdk11/Makefile | 8 | ||||
| -rw-r--r-- | java/openjdk8/Makefile | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 770f6037e871..3c8b088098d6 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -141,14 +141,6 @@ CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" .else MAKE_ENV+= USE_CLANG=true -.if ${COMPILER_VERSION} >= 130 -# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13 -# See also https://bugs.openjdk.java.net/browse/JDK-8229258 -LLVM_VER= 12 -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} -CC= ${LOCALBASE}/bin/clang${LLVM_VER} -CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} -.endif .endif .if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*} diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index e259fa17033b..25d66b274fae 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -203,14 +203,6 @@ LIB_DEPENDS+= libffi.so:devel/libffi .if ${COMPILER_TYPE} == clang MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true CONFIGURE_ENV+= LIBCXX="-lc++" -.if ${COMPILER_VERSION} >= 130 -# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13 -# See also https://bugs.openjdk.java.net/browse/JDK-8229258 -LLVM_VER= 12 -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} -CC= ${LOCALBASE}/bin/clang${LLVM_VER} -CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} -.endif .endif # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html |