git: b56109991d7a - 2024Q3 - java/openjdk8 java/openjdk11 java/openjdk17 java/openjdk18 java/openjdk19 java/openjdk20 java/openjdk21 java/openjdk22: disable warnings as errors

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Sun, 15 Sep 2024 11:39:50 UTC
The branch 2024Q3 has been updated by dim:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b56109991d7a20f8c343c0397d6eb01073972374

commit b56109991d7a20f8c343c0397d6eb01073972374
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-08-29 07:46:12 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-09-15 11:39:30 +0000

    java/openjdk8 java/openjdk11 java/openjdk17 java/openjdk18 java/openjdk19 java/openjdk20 java/openjdk21 java/openjdk22: disable warnings as errors
    
    Generally disable warnings-as-errors for all openjdk ports, removing all
    the conditionals we have now for particular architectures and/or
    compilers. It does not make sense to have this on by default, unless you
    are an upstream maintainer.
    
    PR:             281188
    Approved by:    maintainer timeout (2 weeks)
    MFH:            2024Q3
    
    (cherry picked from commit 3378cc494de65725a36e8ff5aaa205273521ba52)
---
 java/openjdk11/Makefile | 4 +---
 java/openjdk17/Makefile | 5 +----
 java/openjdk18/Makefile | 4 +---
 java/openjdk19/Makefile | 4 +---
 java/openjdk20/Makefile | 4 +---
 java/openjdk21/Makefile | 4 +---
 java/openjdk22/Makefile | 4 +---
 java/openjdk8/Makefile  | 2 +-
 8 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
index 4e1ad8b25325..1111e8b2c66a 100644
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/Makefile
@@ -144,6 +144,7 @@ JDK_BUILD_JVM=	server
 
 MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
 CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
+CONFIGURE_ARGS+=	--disable-warnings-as-errors
 
 .if ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
@@ -154,9 +155,6 @@ CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA
 MAKE_ENV+=	USE_CLANG=true
 .endif
 
-.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*}
-CONFIGURE_ARGS+=	--disable-warnings-as-errors
-.endif
 .if ${ARCH} == aarch64 || ${ARCH:Marmv*}
 CONFIGURE_ARGS+=	--disable-dtrace
 .endif
diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
index de71b4b482bb..69fa98ee5a36 100644
--- a/java/openjdk17/Makefile
+++ b/java/openjdk17/Makefile
@@ -131,6 +131,7 @@ JDK_BUILD_JVM=	server
 
 MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
 CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
+CONFIGURE_ARGS+=	--disable-warnings-as-errors
 
 .if ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
@@ -139,12 +140,8 @@ 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
-CONFIGURE_ARGS+=	--disable-warnings-as-errors
 .endif
 
-.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
-CONFIGURE_ARGS+=	--disable-warnings-as-errors
-.endif
 .if ${ARCH} == aarch64
 CONFIGURE_ARGS+=	--with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers --disable-dtrace
 MAKE_ENV+=		JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers"
diff --git a/java/openjdk18/Makefile b/java/openjdk18/Makefile
index cf09ffb96ab2..f2afc74762f9 100644
--- a/java/openjdk18/Makefile
+++ b/java/openjdk18/Makefile
@@ -141,6 +141,7 @@ JDK_BUILD_JVM=	server
 
 MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
 CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
+CONFIGURE_ARGS+=	--disable-warnings-as-errors
 
 .if ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
@@ -156,9 +157,6 @@ CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
 CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
 .endif
 
-.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
-CONFIGURE_ARGS+=	--disable-warnings-as-errors
-.endif
 .if ${ARCH} == aarch64
 CONFIGURE_ARGS+=	--with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers --disable-dtrace
 MAKE_ENV+=		JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers"
diff --git a/java/openjdk19/Makefile b/java/openjdk19/Makefile
index 7ec6e96b497f..76e891045906 100644
--- a/java/openjdk19/Makefile
+++ b/java/openjdk19/Makefile
@@ -131,6 +131,7 @@ JDK_BUILD_JVM=	server
 
 MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
 CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
+CONFIGURE_ARGS+=	--disable-warnings-as-errors
 
 .if ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
@@ -146,9 +147,6 @@ CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
 CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
 .endif
 
-.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
-CONFIGURE_ARGS+=	--disable-warnings-as-errors
-.endif
 .if ${ARCH} == aarch64
 CONFIGURE_ARGS+=	--with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers --disable-dtrace
 MAKE_ENV+=		JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers"
diff --git a/java/openjdk20/Makefile b/java/openjdk20/Makefile
index 2bb0748cff22..cc25cb796b82 100644
--- a/java/openjdk20/Makefile
+++ b/java/openjdk20/Makefile
@@ -130,6 +130,7 @@ JDK_BUILD_JVM=	server
 
 MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
 CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
+CONFIGURE_ARGS+=	--disable-warnings-as-errors
 
 .if ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
@@ -145,9 +146,6 @@ CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
 CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
 .endif
 
-.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
-CONFIGURE_ARGS+=	--disable-warnings-as-errors
-.endif
 .if ${ARCH} == aarch64
 CONFIGURE_ARGS+=	--with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers --disable-dtrace
 MAKE_ENV+=		JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers"
diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile
index 307fa54abf1b..41faf18a5268 100644
--- a/java/openjdk21/Makefile
+++ b/java/openjdk21/Makefile
@@ -130,6 +130,7 @@ JDK_BUILD_JVM=	server
 
 MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
 CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
+CONFIGURE_ARGS+=	--disable-warnings-as-errors
 
 .if ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
@@ -145,9 +146,6 @@ CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
 CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
 .endif
 
-.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
-CONFIGURE_ARGS+=	--disable-warnings-as-errors
-.endif
 .if ${ARCH} == aarch64
 CONFIGURE_ARGS+=	--with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers --disable-dtrace
 MAKE_ENV+=		JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers"
diff --git a/java/openjdk22/Makefile b/java/openjdk22/Makefile
index cd6505fee645..1bd019591b80 100644
--- a/java/openjdk22/Makefile
+++ b/java/openjdk22/Makefile
@@ -130,6 +130,7 @@ JDK_BUILD_JVM=	server
 
 MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
 CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
+CONFIGURE_ARGS+=	--disable-warnings-as-errors
 
 .if ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
@@ -145,9 +146,6 @@ CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
 CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
 .endif
 
-.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
-CONFIGURE_ARGS+=	--disable-warnings-as-errors
-.endif
 .if ${ARCH} == aarch64
 CONFIGURE_ARGS+=	--with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers --disable-dtrace
 MAKE_ENV+=		JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers"
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 77d3862aa569..e4bfa36adb97 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -202,7 +202,7 @@ LIB_DEPENDS+=	libffi.so:devel/libffi
 .endif
 
 .if ${COMPILER_TYPE} == clang
-MAKE_ENV+=	COMPILER_WARNINGS_FATAL=false USE_CLANG=true
+MAKE_ENV+=	USE_CLANG=true
 CONFIGURE_ENV+=	LIBCXX="-lc++"
 .if ${ARCH} == aarch64
 # PR258954: see <https://bugs.openjdk.org/browse/JDK-8247766>. Even though the