summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2020-04-19 21:28:43 +0000
committerGreg Lewis <glewis@FreeBSD.org>2020-04-19 21:28:43 +0000
commite9995ef7a100707d16615845cc759fa28ef228a9 (patch)
tree7727f10945acb34b77a88cb4b498b1a90b33af58 /java
parentjava/intellij: Update to version 2020.1. (diff)
Update to 7u261
Notes
Notes: svn path=/head/; revision=532162
Diffstat (limited to 'java')
-rw-r--r--java/openjdk7/Makefile2
-rw-r--r--java/openjdk7/distinfo6
-rw-r--r--java/openjdk7/files/patch-hotspot_src_cpu_x86_vm_jni__x86.h14
3 files changed, 4 insertions, 18 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 3e5fcda8fce5..d6ea3944277a 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -53,7 +53,7 @@ INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre
.endif
JDK_MAJOR_VERSION= 7
-JDK_UPDATE_VERSION= 251
+JDK_UPDATE_VERSION= 261
JDK_BUILD_NUMBER= 02
BSD_JDK_VERSION= 1
diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo
index 677867968a31..556b0170c1e6 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1583113236
+TIMESTAMP = 1587323053
SHA256 (apache-ant-1.9.14-bin.tar.gz) = ad6b296a76f0ad433bc6b4ebda41c3275e0dc03f0e9a6c8c299f787a5e4c3fe4
SIZE (apache-ant-1.9.14-bin.tar.gz) = 5837539
-SHA256 (battleblow-jdk7u-7.251.02.1-jdk7u251-b02.1_GH0.tar.gz) = b709d9e344c4ebbc5bb71646a7e78137ad47f2e17fb61739c7be0420ececc707
-SIZE (battleblow-jdk7u-7.251.02.1-jdk7u251-b02.1_GH0.tar.gz) = 69828420
+SHA256 (battleblow-jdk7u-7.261.02.1-jdk7u261-b02.1_GH0.tar.gz) = 708579df5083d52c6ca56ac09425082e0fe1e2c9f986e33a0e131efb3b8733dc
+SIZE (battleblow-jdk7u-7.261.02.1-jdk7u261-b02.1_GH0.tar.gz) = 69823650
diff --git a/java/openjdk7/files/patch-hotspot_src_cpu_x86_vm_jni__x86.h b/java/openjdk7/files/patch-hotspot_src_cpu_x86_vm_jni__x86.h
deleted file mode 100644
index dbdba09700d9..000000000000
--- a/java/openjdk7/files/patch-hotspot_src_cpu_x86_vm_jni__x86.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- hotspot/src/cpu/x86/vm/jni_x86.h.orig 2020-03-01 18:10:20 UTC
-+++ hotspot/src/cpu/x86/vm/jni_x86.h
-@@ -28,7 +28,10 @@
-
- #if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE)
-
--#if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2)
-+#ifndef __has_attribute
-+ #define __has_attribute(x) 0
-+#endif
-+#if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
- #define JNIEXPORT __attribute__((visibility("default")))
- #define JNIIMPORT __attribute__((visibility("default")))
- #else