diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2022-08-02 04:15:45 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2022-08-02 04:15:45 +0000 |
| commit | 8efb59db35f1d89bbd66e1b6ea5dbcbe99a611b2 (patch) | |
| tree | 1878094720a1e0f2ec08c22835d4b998547d05ae | |
| parent | c6ab83674a3038b1f21db989d6377ded53d75990 (diff) | |
| download | ports-8efb59db35f1d89bbd66e1b6ea5dbcbe99a611b2.tar.gz ports-8efb59db35f1d89bbd66e1b6ea5dbcbe99a611b2.zip | |
java/openjdk8: Update to 8u342
| -rw-r--r-- | java/openjdk8/Makefile | 5 | ||||
| -rw-r--r-- | java/openjdk8/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp | 14 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-make-common-MakeBase.gmk | 14 |
4 files changed, 5 insertions, 34 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 3e433a8e7c86..e259fa17033b 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -1,6 +1,5 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -52,8 +51,8 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 332 -JDK_BUILD_NUMBER= 09 +JDK_UPDATE_VERSION= 342 +JDK_BUILD_NUMBER= 07 BSD_JDK_VERSION= 1 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo index 480f11064325..f73bf2b844fc 100644 --- a/java/openjdk8/distinfo +++ b/java/openjdk8/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1651712203 +TIMESTAMP = 1659411435 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c SIZE (jtreg4.1-b08.tar.gz) = 6834252 -SHA256 (battleblow-jdk8u-8.332.09.1-jdk8u332-b09.1_GH0.tar.gz) = 7dda7e79b920d8dd79f54dc28a236126c360c42ef14874447339afd2906a6599 -SIZE (battleblow-jdk8u-8.332.09.1-jdk8u332-b09.1_GH0.tar.gz) = 88705654 +SHA256 (battleblow-jdk8u-8.342.07.1-jdk8u342-b07.1_GH0.tar.gz) = ca878757e98b38f53ac7aa47cd2fb00e01404256c6fd0feced4c563d651ea002 +SIZE (battleblow-jdk8u-8.342.07.1-jdk8u342-b07.1_GH0.tar.gz) = 88770755 diff --git a/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp b/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp deleted file mode 100644 index 0495a62ccb3b..000000000000 --- a/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp +++ /dev/null @@ -1,14 +0,0 @@ ---- hotspot/src/cpu/aarch64/vm/pauth_aarch64.hpp -+++ hotspot/src/cpu/aarch64/vm/pauth_aarch64.hpp -@@ -25,7 +25,11 @@ - #ifndef CPU_AARCH64_PAUTH_AARCH64_INLINE_HPP - #define CPU_AARCH64_PAUTH_AARCH64_INLINE_HPP - -+#if defined(LINUX) - #include "pauth_linux_aarch64.inline.hpp" -+#elif defined(_ALLBSD_SOURCE) -+#include "pauth_bsd_aarch64.inline.hpp" -+#endif - - inline bool pauth_ptr_is_raw(address ptr) { - // Confirm none of the high bits are set in the pointer. diff --git a/java/openjdk8/files/patch-make-common-MakeBase.gmk b/java/openjdk8/files/patch-make-common-MakeBase.gmk deleted file mode 100644 index b7a7ffaa719e..000000000000 --- a/java/openjdk8/files/patch-make-common-MakeBase.gmk +++ /dev/null @@ -1,14 +0,0 @@ ---- make/common/MakeBase.gmk.orig 2022-05-04 18:19:33.661930000 -0700 -+++ make/common/MakeBase.gmk 2022-05-04 18:19:45.573627000 -0700 -@@ -318,11 +318,6 @@ - # Emit the scm:id pair to $@ - define GetSourceTips - $(CD) $(SRC_ROOT) ; \ -- if [ -d $(SCM_DIR) -a "$(SCM_VERSION)" != "" ] ; then \ -- $(ID_COMMAND) >> $@ ; \ -- elif [ -f $(SCM_TIP_FILENAME) ] ; then \ -- $(SCM_TIP_FILECMD) >> $@ ; \ -- fi; - $(PRINTF) "\n" >> $@ - endef - |