1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00

java/openjdk11: remove custom LLVM - build with LLVM from base

Segfaults are no longer observed with current versions of LLVM 17 and 18
in base 13.3 and 14.1, so there is no need to pull such an old version
from ports to build.
For example build java/openjdk11 with LLVM from base and then build
java/eclipse and java/openjfx14 using java/openjdk11: build and run
without errors.

PR:		280056 260319
Approved by:	java (maintainer, timeout 14 days)
This commit is contained in:
Vladimir Druzenko 2024-07-14 16:44:52 +03:00
parent 2a05f315d1
commit 08cc50220f
2 changed files with 21 additions and 5 deletions

View File

@ -152,13 +152,9 @@ 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
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
.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*}
.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*}
CONFIGURE_ARGS+= --disable-warnings-as-errors
.endif
.if ${ARCH} == aarch64 || ${ARCH:Marmv*}

View File

@ -0,0 +1,20 @@
--- make/hotspot/lib/JvmMapfile.gmk.orig 2024-04-18 01:56:50 UTC
+++ make/hotspot/lib/JvmMapfile.gmk
@@ -65,7 +65,7 @@ ifeq ($(call isTargetOs, linux), true)
# platform dependent.
ifeq ($(call isTargetOs, linux), true)
- DUMP_SYMBOLS_CMD := $(NM) --defined-only *.o
+ DUMP_SYMBOLS_CMD := $(NM) --extern-only --defined-only *.o
ifneq ($(FILTER_SYMBOLS_PATTERN), )
FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)|
endif
@@ -143,7 +143,7 @@ else ifeq ($(OPENJDK_TARGET_OS), bsd)
if ($$3 ~ /$(FILTER_SYMBOLS_PATTERN)/) print $$3; \
}'
else
- DUMP_SYMBOLS_CMD := $(NM) --defined-only *.o
+ DUMP_SYMBOLS_CMD := $(NM) --extern-only --defined-only *.o
FILTER_SYMBOLS_AWK_SCRIPT := \
'{ \
if ($$3 ~ /$(FILTER_SYMBOLS_PATTERN)/) print $$3; \