Sun Jun 27 08:53:55 2021 UTC ()
openjdk11: update to 1.11.0.11.9

Update to 11.0.11 GA
FreeBSD support for armv6/7


(tnn)
diff -r1.33 -r1.34 pkgsrc/lang/openjdk11/Makefile
diff -r1.22 -r1.23 pkgsrc/lang/openjdk11/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/openjdk11/patches/patch-make_autoconf_flags-cflags.m4
cvs diff -r1.33 -r1.34 pkgsrc/lang/openjdk11/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/Makefile 2021/04/21 13:24:54 1.33
+++ pkgsrc/lang/openjdk11/Makefile 2021/06/27 08:53:54 1.34
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.33 2021/04/21 13:24:54 adam Exp $ 1# $NetBSD: Makefile,v 1.34 2021/06/27 08:53:54 tnn Exp $
2 2
3DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/} 3DISTNAME= openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/} 4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
5PKGREVISION= 3 
6CATEGORIES= lang 5CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
8GITHUB_PROJECT= openjdk-jdk11u 7GITHUB_PROJECT= openjdk-jdk11u
9GITHUB_TAG= jdk-11.0.10+9-1 8GITHUB_TAG= jdk-11.0.11+9-1
10 9
11MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://openjdk.java.net/ 11HOMEPAGE= https://openjdk.java.net/
13COMMENT= Open-source implementation of the Java Platform, Standard Edition 12COMMENT= Open-source implementation of the Java Platform, Standard Edition
14LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
15 14
16DISTFILES= ${DEFAULT_DISTFILES} 15DISTFILES= ${DEFAULT_DISTFILES}
17EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
18 17
19JAVA_NAME= openjdk11 18JAVA_NAME= openjdk11
20JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} 19JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
21JAVA_WRAPPERS= jar jarsigner java javac javadoc javap jcmd jconsole jdb \ 20JAVA_WRAPPERS= jar jarsigner java javac javadoc javap jcmd jconsole jdb \
22 jdeprscan jdeps jfr jimage jinfo jlink jmap jmod jps \ 21 jdeprscan jdeps jfr jimage jinfo jlink jmap jmod jps \
cvs diff -r1.22 -r1.23 pkgsrc/lang/openjdk11/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/distinfo 2021/02/06 13:02:45 1.22
+++ pkgsrc/lang/openjdk11/distinfo 2021/06/27 08:53:54 1.23
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: distinfo,v 1.22 2021/02/06 13:02:45 tnn Exp $ 1$NetBSD: distinfo,v 1.23 2021/06/27 08:53:54 tnn Exp $
2 2
3SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c 3SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c
4RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8 4RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8
5SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 6e61996f7e3c3492b0c878644db30d72021dc4096639992e53b4440d4e2e18cd92e5630ecd4600d1917a1e63a7c814b63f74f811a40588febfe19ad8d3208a9d 5SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 6e61996f7e3c3492b0c878644db30d72021dc4096639992e53b4440d4e2e18cd92e5630ecd4600d1917a1e63a7c814b63f74f811a40588febfe19ad8d3208a9d
6Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 105760636 bytes 6Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 105760636 bytes
7SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 0ab80546e192cff461dfadf85ca8dc42d11a2710 7SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 0ab80546e192cff461dfadf85ca8dc42d11a2710
8RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = ec41da372ab1f927295a207a65a2a5f940760339 8RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = ec41da372ab1f927295a207a65a2a5f940760339
9SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 1bf5336e9bfeea9ecbcd347f2ea8dd3c9633df42cab13a09c7afaae94faa95b92d862dd97caf380a7037825c3324377240d5d0639b2e0b31a2d7a6316ed56359 9SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 1bf5336e9bfeea9ecbcd347f2ea8dd3c9633df42cab13a09c7afaae94faa95b92d862dd97caf380a7037825c3324377240d5d0639b2e0b31a2d7a6316ed56359
10Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes 10Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes
11SHA1 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = a1339a72f399c154104fcf46766b4c259ac24783 11SHA1 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = a1339a72f399c154104fcf46766b4c259ac24783
12RMD160 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = edf0054b7c2fa2eff641b2c385a4f9de07eb0247 12RMD160 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = edf0054b7c2fa2eff641b2c385a4f9de07eb0247
13SHA512 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 735f47d7398a48f0963c5d629c6c319dfe22d84bacd45f84a34f4784433c8cf6bfe6b356363a4591f035bec4a32e2e38d0a9c6be361aa57e5f0170ad4e16a1ad 13SHA512 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 735f47d7398a48f0963c5d629c6c319dfe22d84bacd45f84a34f4784433c8cf6bfe6b356363a4591f035bec4a32e2e38d0a9c6be361aa57e5f0170ad4e16a1ad
14Size (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 99673444 bytes 14Size (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 99673444 bytes
15SHA1 (openjdk-jdk11u-jdk-11.0.10-9-1.tar.gz) = 793f282501163f717b7df4305cceae3e283c6896 15SHA1 (openjdk-jdk11u-jdk-11.0.11-9-1.tar.gz) = 71c1216e4664a4467c21663977d7fa0644ed92b4
16RMD160 (openjdk-jdk11u-jdk-11.0.10-9-1.tar.gz) = 1ee3361c24ff183ee580c82e446680da14506bf1 16RMD160 (openjdk-jdk11u-jdk-11.0.11-9-1.tar.gz) = b89fca5544808d9ca96cfe0c049386fae53e875a
17SHA512 (openjdk-jdk11u-jdk-11.0.10-9-1.tar.gz) = b8d684dad251a7625d2a98286eb85b984a6e0d860e98de845e1adda22ce53e7dba7fce12160ed1fc6a6a0c9bab1d43531174d141e2d7e1e5467b38e06a723bfb 17SHA512 (openjdk-jdk11u-jdk-11.0.11-9-1.tar.gz) = 6d38b807e981657cc232d93e13efe9d1cb1b85d349135360f75d4658e40b7ed4b86a68c8467528030773f3edd7db7df6a65918cfa52b4e417876f35515de65f4
18Size (openjdk-jdk11u-jdk-11.0.10-9-1.tar.gz) = 122486444 bytes 18Size (openjdk-jdk11u-jdk-11.0.11-9-1.tar.gz) = 122607262 bytes
19SHA1 (patch-make_autoconf_basics.m4) = 5a8d3cd229f73eef34fb3860dfae1a813ec39ab5 19SHA1 (patch-make_autoconf_basics.m4) = 5a8d3cd229f73eef34fb3860dfae1a813ec39ab5
20SHA1 (patch-make_autoconf_flags-cflags.m4) = 7ec010eb62a1e4f057b7886caf0d0efaae4b6b63 20SHA1 (patch-make_autoconf_flags-cflags.m4) = 3b37853298805e2ffb92d3babd700d0048f24d8d
21SHA1 (patch-make_autoconf_jdk-options.m4) = d0d9fbaf29cc521fa4b62b1ea2616dc8f3b07618 21SHA1 (patch-make_autoconf_jdk-options.m4) = d0d9fbaf29cc521fa4b62b1ea2616dc8f3b07618
22SHA1 (patch-make_autoconf_lib-bundled.m4) = 8720c3f674955e8a51b2ab7dba80c36d34ba8594 22SHA1 (patch-make_autoconf_lib-bundled.m4) = 8720c3f674955e8a51b2ab7dba80c36d34ba8594
23SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54 23SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54
24SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f 24SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f
25SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d 25SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d
26SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07 26SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07
27SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d 27SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d
28SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp) = 70cd073fcc3e84e673228754dd0fb85ce5ae7102 28SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp) = 70cd073fcc3e84e673228754dd0fb85ce5ae7102
29SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.hpp) = 042ae280b0988c945ed96a2c20e9f1cb356d8efe 29SHA1 (patch-src_hotspot_cpu_aarch64_vm__version__aarch64.hpp) = 042ae280b0988c945ed96a2c20e9f1cb356d8efe
30SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.inline.hpp) = 4153d3a12ffc24de868b2fd97498dbdf7645e499 30SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_bytes__bsd__aarch64.inline.hpp) = 4153d3a12ffc24de868b2fd97498dbdf7645e499
31SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp) = 190f56e8c725884712d850e096955d6d694e902d 31SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp) = 190f56e8c725884712d850e096955d6d694e902d
32SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp) = abbfd0f9bd79e6363ffb050b48d081b7d1c3a8e1 32SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp) = abbfd0f9bd79e6363ffb050b48d081b7d1c3a8e1
33SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 6322cbdda03dee528e89ac8b725f3df5e2165797 33SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 6322cbdda03dee528e89ac8b725f3df5e2165797
cvs diff -r1.1 -r1.2 pkgsrc/lang/openjdk11/patches/patch-make_autoconf_flags-cflags.m4 (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/patches/patch-make_autoconf_flags-cflags.m4 2019/10/01 12:36:34 1.1
+++ pkgsrc/lang/openjdk11/patches/patch-make_autoconf_flags-cflags.m4 2021/06/27 08:53:54 1.2
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1$NetBSD: patch-make_autoconf_flags-cflags.m4,v 1.1 2019/10/01 12:36:34 tnn Exp $ 1$NetBSD: patch-make_autoconf_flags-cflags.m4,v 1.2 2021/06/27 08:53:54 tnn Exp $
2 2
3We prefer to use explicit run paths. 3We prefer to use explicit run paths.
4 4
5--- make/autoconf/flags-cflags.m4.orig 2019-09-19 12:22:38.000000000 +0000 5--- make/autoconf/flags-cflags.m4.orig 2021-04-24 02:47:22.000000000 +0000
6+++ make/autoconf/flags-cflags.m4 6+++ make/autoconf/flags-cflags.m4
7@@ -39,8 +39,8 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS], 7@@ -39,8 +39,8 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
8  8
9 # Default works for linux, might work on other platforms as well. 9 # Default works for linux, might work on other platforms as well.
10 SHARED_LIBRARY_FLAGS='-shared' 10 SHARED_LIBRARY_FLAGS='-shared'
11- SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1' 11- SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
12- SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" 12- SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
13+ SET_EXECUTABLE_ORIGIN='@COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib @COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib/server' 13+ SET_EXECUTABLE_ORIGIN='@COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib @COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib/server'
14+ SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" 14+ SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
15 SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' 15 SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
16 SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1' 16 SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
17  17
18@@ -58,17 +58,10 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS], 18@@ -58,17 +58,11 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
19 else 19 else
20 # Default works for linux, might work on other platforms as well. 20 # Default works for linux, might work on other platforms as well.
21 SHARED_LIBRARY_FLAGS='-shared' 21 SHARED_LIBRARY_FLAGS='-shared'
22- SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1' 22- SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
23+ SET_EXECUTABLE_ORIGIN='@COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib @COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib/server' 23+ SET_EXECUTABLE_ORIGIN='@COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib @COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib/server'
24+ SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" 24+ SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
25 SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' 25 SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
26 SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1' 26 SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
27- 27
28- # arm specific settings 28- # arm specific settings
29- if test "x$OPENJDK_TARGET_CPU" = "xarm"; then 29- if test "x$OPENJDK_TARGET_CPU" = "xarm" && test "x$OPENJDK_TARGET_OS" = xlinux; then
30- # '-Wl,-z,origin' isn't used on arm. 30- # '-Wl,-z,origin' isn't used on arm.
31- SET_SHARED_LIBRARY_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1' 31- SET_SHARED_LIBRARY_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1'
32- else 32- else
33- SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN" 33- SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
34- fi 34- fi
35 fi 35 fi
36  36
37 elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then 37 elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then