aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2021-02-07 05:19:58 +0000
committerGreg Lewis <glewis@FreeBSD.org>2021-02-07 05:19:58 +0000
commit38debecfd7c9a3e8c8d8818adf4fa67fec263f9d (patch)
tree41487f5df3a88f3887a0416e4756c2d2578618a6 /java
parente37330b6276ca7f27a66d603a8ac8a6cab23e6d7 (diff)
downloadports-38debecfd7c9a3e8c8d8818adf4fa67fec263f9d.tar.gz
ports-38debecfd7c9a3e8c8d8818adf4fa67fec263f9d.zip
Update to 13.0.7.1
Notes
Notes: svn path=/head/; revision=564603
Diffstat (limited to 'java')
-rw-r--r--java/openjdk13/Makefile5
-rw-r--r--java/openjdk13/distinfo6
-rw-r--r--java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp20
3 files changed, 5 insertions, 26 deletions
diff --git a/java/openjdk13/Makefile b/java/openjdk13/Makefile
index 81c5e444f8e7..08a2156a9fd1 100644
--- a/java/openjdk13/Makefile
+++ b/java/openjdk13/Makefile
@@ -3,7 +3,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= 5
-JDK_BUILD_NUMBER= 3
+JDK_PATCH_VERSION= 7
+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
diff --git a/java/openjdk13/distinfo b/java/openjdk13/distinfo
index a00af0a2ceab..3ab3c2e534ea 100644
--- a/java/openjdk13/distinfo
+++ b/java/openjdk13/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603425742
-SHA256 (battleblow-openjdk-jdk13u-jdk-13.0.5+3-1_GH0.tar.gz) = 06632dccb077502c164a0c3bec5357b4d71ea11ff7157944864cf1e176f5db2e
-SIZE (battleblow-openjdk-jdk13u-jdk-13.0.5+3-1_GH0.tar.gz) = 109000231
+TIMESTAMP = 1612671777
+SHA256 (battleblow-openjdk-jdk13u-jdk-13.0.7+1-1_GH0.tar.gz) = 88d687b6ed0c79a7c6ffef2451d1e155ad898cea119d501e9d89c97753104185
+SIZE (battleblow-openjdk-jdk13u-jdk-13.0.7+1-1_GH0.tar.gz) = 109068987
diff --git a/java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp b/java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp
deleted file mode 100644
index 4f304ce6b1ae..000000000000
--- a/java/openjdk13/files/patch-src_hotspot_share_opto_addnode.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/hotspot/share/opto/addnode.cpp
-+++ src/hotspot/share/opto/addnode.cpp
-@@ -917,7 +917,7 @@ Node *MinINode::Ideal(PhaseGVN *phase, bool can_reshape) {
-
- // Transform MIN2(x + c0, MIN2(x + c1, z)) into MIN2(x + MIN2(c0, c1), z)
- // if x == y and the additions can't overflow.
-- if (phase->eqv(x,y) &&
-+ if (phase->eqv(x,y) && tx != NULL &&
- !can_overflow(tx, x_off) &&
- !can_overflow(tx, y_off)) {
- return new MinINode(phase->transform(new AddINode(x, phase->intcon(MIN2(x_off, y_off)))), r->in(2));
-@@ -925,7 +925,7 @@ Node *MinINode::Ideal(PhaseGVN *phase, bool can_reshape) {
- } else {
- // Transform MIN2(x + c0, y + c1) into x + MIN2(c0, c1)
- // if x == y and the additions can't overflow.
-- if (phase->eqv(x,y) &&
-+ if (phase->eqv(x,y) && tx != NULL &&
- !can_overflow(tx, x_off) &&
- !can_overflow(tx, y_off)) {
- return new AddINode(x,phase->intcon(MIN2(x_off,y_off)));