Attachment 251783 Details for Bug 280056 – Remove custom LLVM - build with LLVM from base

[patch] Remove custom LLVM - build with LLVM from base

openjdk11.diff (text/plain), 1.89 KB, created by Vladimir Druzenko on 2024-06-29 22:24:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2024-06-29 22:24:43 UTC

Size: 1.89 KB

patch

obsolete

>diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
>index f436494cfb4e..06cc294c82c6 100644
>--- a/java/openjdk11/Makefile
>+++ b/java/openjdk11/Makefile
>@@ -152,15 +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
>-.if ${COMPILER_VERSION} >= 130
>-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*}
>+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*}
> CONFIGURE_ARGS+=	--disable-warnings-as-errors
> .endif
> .if ${ARCH} == aarch64 || ${ARCH:Marmv*}
>diff --git a/java/openjdk11/files/patch-make_hotspot_lib_JvmMapfile.gmk b/java/openjdk11/files/patch-make_hotspot_lib_JvmMapfile.gmk
>new file mode 100644
>index 000000000000..b7380c2a0b76
>--- /dev/null
>+++ b/java/openjdk11/files/patch-make_hotspot_lib_JvmMapfile.gmk
>@@ -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; \

Actions: View | Diff

Attachments on bug 280056: 251783 | 251822