summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2024-06-15 20:44:12 +0200
committerRene Ladan <rene@FreeBSD.org>2024-07-01 22:27:23 +0200
commit19d68720f1dac6176557ffa8d9c1684c4cf22608 (patch)
tree0df1bf503e59370bcb01f06f7f8ba1e1cf742c0f /java
parentgraphics/intel-backlight: Remove expired port (diff)
all: drop support for FreeBSD 13.2 which reached EOL today
Thanks again to jbeich for noticing various things I overlooked. Reviewed by: acm, ashish, eduardo, ehaupt, eugen, jbeich, martymac, mat, nobukata, sunpoet, tagattie, yuri, arrowd, kde Differential Revision: https://reviews.freebsd.org/D45141
Diffstat (limited to 'java')
-rw-r--r--java/eclipse/Makefile2
-rw-r--r--java/openjdk11/Makefile2
-rw-r--r--java/openjdk17/Makefile6
-rw-r--r--java/openjdk18/Makefile6
-rw-r--r--java/openjdk19/Makefile6
-rw-r--r--java/openjdk20/Makefile6
-rw-r--r--java/openjdk21/Makefile6
-rw-r--r--java/openjdk22/Makefile6
-rw-r--r--java/openjdk8/Makefile4
9 files changed, 2 insertions, 42 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index fd276415a85e..2f314aaf89ab 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -75,7 +75,7 @@ ECLIPSE_RESULT= eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.rep
.include <bsd.port.pre.mk>
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150
+.if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-deprecated-non-prototype
.endif
diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
index f436494cfb4e..a891d0f62d90 100644
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/Makefile
@@ -152,13 +152,11 @@ 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*}
CONFIGURE_ARGS+= --disable-warnings-as-errors
diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
index 4d1c91d25526..e7039439f653 100644
--- a/java/openjdk17/Makefile
+++ b/java/openjdk17/Makefile
@@ -139,18 +139,12 @@ 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
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
-.if ${COMPILER_VERSION} >= 140
EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
-.endif
-.if ${COMPILER_VERSION} >= 150
EXTRA_CFLAGS+= -Wno-deprecated-non-prototype
-.endif
CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
.endif
-.endif
.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
CONFIGURE_ARGS+= --disable-warnings-as-errors
diff --git a/java/openjdk18/Makefile b/java/openjdk18/Makefile
index ce47e54f0dc2..cf09ffb96ab2 100644
--- a/java/openjdk18/Makefile
+++ b/java/openjdk18/Makefile
@@ -149,18 +149,12 @@ 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
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
-.if ${COMPILER_VERSION} >= 140
EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
-.endif
-.if ${COMPILER_VERSION} >= 150
EXTRA_CFLAGS+= -Wno-deprecated-non-prototype
-.endif
CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
.endif
-.endif
.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
CONFIGURE_ARGS+= --disable-warnings-as-errors
diff --git a/java/openjdk19/Makefile b/java/openjdk19/Makefile
index 4f7b75442cb0..7ec6e96b497f 100644
--- a/java/openjdk19/Makefile
+++ b/java/openjdk19/Makefile
@@ -139,18 +139,12 @@ 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
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
-.if ${COMPILER_VERSION} >= 140
EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
-.endif
-.if ${COMPILER_VERSION} >= 160
EXTRA_CFLAGS+= -Wno-error=deprecated-non-prototype
-.endif
CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
.endif
-.endif
.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
CONFIGURE_ARGS+= --disable-warnings-as-errors
diff --git a/java/openjdk20/Makefile b/java/openjdk20/Makefile
index 3ad5fd920106..2bb0748cff22 100644
--- a/java/openjdk20/Makefile
+++ b/java/openjdk20/Makefile
@@ -138,18 +138,12 @@ 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
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
-.if ${COMPILER_VERSION} >= 140
EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
-.endif
-.if ${COMPILER_VERSION} >= 160
EXTRA_CFLAGS+= -Wno-error=deprecated-non-prototype
-.endif
CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
.endif
-.endif
.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
CONFIGURE_ARGS+= --disable-warnings-as-errors
diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile
index de00430e481d..307fa54abf1b 100644
--- a/java/openjdk21/Makefile
+++ b/java/openjdk21/Makefile
@@ -138,18 +138,12 @@ 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
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
-.if ${COMPILER_VERSION} >= 140
EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
-.endif
-.if ${COMPILER_VERSION} >= 160
EXTRA_CFLAGS+= -Wno-error=deprecated-non-prototype
-.endif
CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
.endif
-.endif
.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
CONFIGURE_ARGS+= --disable-warnings-as-errors
diff --git a/java/openjdk22/Makefile b/java/openjdk22/Makefile
index dbe4098c1b48..cd6505fee645 100644
--- a/java/openjdk22/Makefile
+++ b/java/openjdk22/Makefile
@@ -138,18 +138,12 @@ 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
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
-.if ${COMPILER_VERSION} >= 140
EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
-.endif
-.if ${COMPILER_VERSION} >= 160
EXTRA_CFLAGS+= -Wno-error=deprecated-non-prototype
-.endif
CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
.endif
-.endif
.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
CONFIGURE_ARGS+= --disable-warnings-as-errors
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 13b7e8881df5..77d3862aa569 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -204,7 +204,7 @@ LIB_DEPENDS+= libffi.so:devel/libffi
.if ${COMPILER_TYPE} == clang
MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true
CONFIGURE_ENV+= LIBCXX="-lc++"
-.if ${COMPILER_VERSION} >= 130 && ${ARCH} == aarch64
+.if ${ARCH} == aarch64
# PR258954: see <https://bugs.openjdk.org/browse/JDK-8247766>. Even though the
# upstream fix has been applied to this version of the JDK, users still report
# the assertion "guarantee(val < (1U << nbits)) failed: Field too big for insn"
@@ -214,14 +214,12 @@ BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
CC= ${LOCALBASE}/bin/clang${LLVM_VER}
CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
.endif
-.if ${COMPILER_VERSION} >= 160
# clang 16 defaults to C++17, which no longer allows the 'register' keyword.
# There is an upstream commit that removes all the individual 'register'
# keywords, but it has not yet been backported to OpenJDK 8.
# NOTE: passing this option via --with-extra-cflags does not work.
CFLAGS+= -Dregister=
.endif
-.endif
# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
.if ${COMPILER_TYPE} == gcc