summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/openjdk13/Makefile12
-rw-r--r--java/openjdk13/distinfo6
2 files changed, 6 insertions, 12 deletions
diff --git a/java/openjdk13/Makefile b/java/openjdk13/Makefile
index ea5e79d3d418..e03012bd2150 100644
--- a/java/openjdk13/Makefile
+++ b/java/openjdk13/Makefile
@@ -1,7 +1,6 @@
PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION= 1
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
@@ -56,8 +55,8 @@ NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 13
JDK_MINOR_VERSION= 0
-JDK_PATCH_VERSION= 8
-JDK_BUILD_NUMBER= 5
+JDK_PATCH_VERSION= 10
+JDK_BUILD_NUMBER= 1
BSD_JDK_VERSION= 1
JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20
@@ -131,12 +130,7 @@ CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA
.else
MAKE_ENV+= USE_CLANG=true
.if ${COMPILER_VERSION} >= 130
-# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13
-# See also https://bugs.openjdk.java.net/browse/JDK-8229258
-LLVM_VER= 12
-BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
-CC= ${LOCALBASE}/bin/clang${LLVM_VER}
-CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
+CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"
.endif
.endif
diff --git a/java/openjdk13/distinfo b/java/openjdk13/distinfo
index 70a8faf9214a..2f6def42573c 100644
--- a/java/openjdk13/distinfo
+++ b/java/openjdk13/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627699765
-SHA256 (battleblow-jdk13u-jdk-13.0.8+5-1_GH0.tar.gz) = 45731945627cd6b0910200ac744697e9a159f7b801abcbe0283c74e5202c41ef
-SIZE (battleblow-jdk13u-jdk-13.0.8+5-1_GH0.tar.gz) = 109182266
+TIMESTAMP = 1635922938
+SHA256 (battleblow-jdk13u-jdk-13.0.10+1-1_GH0.tar.gz) = c074e2d9dd64f16c00bf4f83212d16641b5ab6eb844c8a14fd5dc22756a1c5cb
+SIZE (battleblow-jdk13u-jdk-13.0.10+1-1_GH0.tar.gz) = 109211491