summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2024-08-29 09:46:12 +0200
committerDimitry Andric <dim@FreeBSD.org>2024-09-15 13:36:13 +0200
commit3378cc494de65725a36e8ff5aaa205273521ba52 (patch)
tree281e7278b5512b362cbfd9e0f5d392b6b5cb4c7a /java
parentsysutils/coreutils: Fix GMP option (diff)
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
Diffstat (limited to 'java')
-rw-r--r--java/openjdk11/Makefile4
-rw-r--r--java/openjdk17/Makefile5
-rw-r--r--java/openjdk18/Makefile4
-rw-r--r--java/openjdk19/Makefile4
-rw-r--r--java/openjdk20/Makefile4
-rw-r--r--java/openjdk21/Makefile4
-rw-r--r--java/openjdk22/Makefile4
-rw-r--r--java/openjdk8/Makefile2
8 files changed, 8 insertions, 23 deletions
diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
index da7fa2f9fea1..ad761e1e0d05 100644
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/Makefile
@@ -148,6 +148,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
@@ -159,9 +160,6 @@ CONFIGURE_ARGS+=--disable-precompiled-headers
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 f93a39d7ddb3..a07904f8e69f 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 02602e28dd70..1fd46b7c8835 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 9456a355bb6a..1abbc17ca84e 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 a90b1c831754..1b9f0a35ea3d 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -203,7 +203,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++"
# clang 16 defaults to C++17, which no longer allows the 'register' keyword.
# There is an upstream commit that removes all the individual 'register'
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 21:35:52 +0000