Browse Source

java/openjdk{8,11}: Remove dependency on devel/llvm12 which is no longer necessary

The workarounds committed in aa1ca89826 and 846ff4e952 are no longer
necessary, as both the upstream commits for PR258954
(305a68a90c)
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
main
Dimitry Andric 5 days ago
parent
commit
591a784f32
  1. 8
      java/openjdk11/Makefile
  2. 8
      java/openjdk8/Makefile

8
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*}

8
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

Loading…
Cancel
Save