diff options
| -rw-r--r-- | java/openjdk11/Makefile | 4 | ||||
| -rw-r--r-- | java/openjdk17/Makefile | 5 | ||||
| -rw-r--r-- | java/openjdk18/Makefile | 4 | ||||
| -rw-r--r-- | java/openjdk19/Makefile | 4 | ||||
| -rw-r--r-- | java/openjdk20/Makefile | 4 | ||||
| -rw-r--r-- | java/openjdk21/Makefile | 4 | ||||
| -rw-r--r-- | java/openjdk22/Makefile | 4 | ||||
| -rw-r--r-- | java/openjdk8/Makefile | 2 | 
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' | 
