D46500.id142653.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D46500.id142653.diff
View Options

	diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
	--- a/java/openjdk8/Makefile
	+++ b/java/openjdk8/Makefile
	@@ -1,5 +1,6 @@
	PORTNAME= openjdk
	PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
	+PORTREVISION= 1
	CATEGORIES= java devel
	MASTER_SITES= LOCAL/jkim:jtreg
	PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
	@@ -204,16 +205,6 @@
	.if ${COMPILER_TYPE} == clang
	MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true
	CONFIGURE_ENV+= LIBCXX="-lc++"
	-.if ${ARCH} == aarch64
	-# PR258954: see <https://bugs.openjdk.org/browse/JDK-8247766>. Even though the
	-# upstream fix has been applied to this version of the JDK, users still report
	-# the assertion "guarantee(val < (1U << nbits)) failed: Field too big for insn"
	-# occurring, when it is built with recent versions of clang.
	-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
	# clang 16 defaults to C++17, which no longer allows the 'register' keyword.
	# There is an upstream commit that removes all the individual 'register'
	# keywords, but it has not yet been backported to OpenJDK 8.