Sun Aug 28 13:58:00 2022 UTC ()
Pullup ticket #6668 - requested by khorben
lang/openjdk8: security update
lang/openjdk11: security update

Revisions pulled up:
- lang/openjdk11/Makefile                                       1.45
- lang/openjdk11/distinfo                                       1.35
- lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk deleted
- lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk      deleted
- lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp deleted
- lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp deleted
- lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp deleted
- lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp deleted
- lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc deleted
- lang/openjdk8/Makefile                                        1.111-1.112
- lang/openjdk8/distinfo                                        1.89-1.91
- lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 1.22
- lang/openjdk8/patches/patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp deleted
- lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp 1.2-1.3
- lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp deleted
- lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp deleted
- lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp deleted
- lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp deleted
- lang/openjdk8/patches/patch-make_common_MakeBase.gmk          deleted

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   ryoon
   Date:           Sun Jul 10 14:47:25 UTC 2022

   Modified Files:
           pkgsrc/lang/openjdk8: Makefile distinfo
           pkgsrc/lang/openjdk8/patches:
               patch-common_autoconf_generated-configure.sh
               patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
   Added Files:
           pkgsrc/lang/openjdk8/patches: patch-make_common_MakeBase.gmk
   Removed Files:
           pkgsrc/lang/openjdk8/patches:
               patch-hotspot_src_share_vm_classfile_symbolTable.cpp
               patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
               patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
               patch-hotspot_src_share_vm_memory_metaspace.cpp

   Log Message:
   openjdk8: Update to 1.8.332

   CHangelog:
   Follow OpenJDK 8u332 GA.

   To generate a diff of this commit:
   cvs rdiff -u -r1.110 -r1.111 pkgsrc/lang/openjdk8/Makefile
   cvs rdiff -u -r1.88 -r1.89 pkgsrc/lang/openjdk8/distinfo
   cvs rdiff -u -r1.21 -r1.22 \
       pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
   cvs rdiff -u -r1.1 -r1.2 \
       pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
   cvs rdiff -u -r1.1 -r0 \
       pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp \
       pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp \
       pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp \
       pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp
   cvs rdiff -u -r0 -r1.3 \
       pkgsrc/lang/openjdk8/patches/patch-make_common_MakeBase.gmk

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tnn
   Date:           Sun Jul 17 03:03:41 UTC 2022

   Modified Files:
           pkgsrc/lang/openjdk8: distinfo
           pkgsrc/lang/openjdk8/patches:
               patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
   Added Files:
           pkgsrc/lang/openjdk8/patches:
               patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp

   Log Message:
   openjdk8: fix NetBSD/evbarm-aarch64 build; PAC is only supported on Linux

   To generate a diff of this commit:
   cvs rdiff -u -r1.89 -r1.90 pkgsrc/lang/openjdk8/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/lang/openjdk8/patches/patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
   cvs rdiff -u -r1.2 -r1.3 \
       pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tnn
   Date:           Mon Aug 15 12:23:06 UTC 2022

   Modified Files:
           pkgsrc/lang/openjdk11: Makefile distinfo
           pkgsrc/lang/openjdk8: Makefile distinfo
   Removed Files:
           pkgsrc/lang/openjdk11/patches: patch-make_common_NativeCompilation.gmk
               patch-make_lib_Awt2dLibraries.gmk
               patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp
               patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp
               patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp
               patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
               patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
           pkgsrc/lang/openjdk8/patches:
               patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
               patch-make_common_MakeBase.gmk

   Log Message:
   openjdk*: Security & bugfix update for the long term support branches

   Upstream kindly merged many of the NetBSD-specific patches. Thanks! <3

   To generate a diff of this commit:
   cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/openjdk11/Makefile
   cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/openjdk11/distinfo
   cvs rdiff -u -r1.1 -r0 \
       pkgsrc/lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk \
       pkgsrc/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk \
       pkgsrc/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp \
       pkgsrc/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp \
       pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp \
       pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
   cvs rdiff -u -r1.2 -r0 \
       pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
   cvs rdiff -u -r1.111 -r1.112 pkgsrc/lang/openjdk8/Makefile
   cvs rdiff -u -r1.90 -r1.91 pkgsrc/lang/openjdk8/distinfo
   cvs rdiff -u -r1.1 -r0 \
       pkgsrc/lang/openjdk8/patches/patch-hotspot_src_cpu_aarch64_vm_pauth__aarch64.hpp
   cvs rdiff -u -r1.3 -r0 \
       pkgsrc/lang/openjdk8/patches/patch-make_common_MakeBase.gmk


(spz)
diff -r1.44 -r1.44.2.1 pkgsrc/lang/openjdk11/Makefile
diff -r1.34 -r1.34.2.1 pkgsrc/lang/openjdk11/distinfo
diff -r1.1 -r0 pkgsrc/lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk
diff -r1.1 -r0 pkgsrc/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk
diff -r1.1 -r0 pkgsrc/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp
diff -r1.1 -r0 pkgsrc/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp
diff -r1.1 -r0 pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp
diff -r1.1 -r0 pkgsrc/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
diff -r1.2 -r0 pkgsrc/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
diff -r1.110 -r1.110.6.1 pkgsrc/lang/openjdk8/Makefile
diff -r1.88 -r1.88.2.1 pkgsrc/lang/openjdk8/distinfo
diff -r1.21 -r1.21.8.1 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
diff -r1.1 -r1.1.8.1 pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp
diff -r1.1 -r0 pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp
diff -r1.1 -r0 pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
diff -r1.1 -r0 pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
diff -r1.1 -r0 pkgsrc/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp
cvs diff -r1.44 -r1.44.2.1 pkgsrc/lang/openjdk11/Makefile (switch to unified diff)

--- pkgsrc/lang/openjdk11/Makefile 2022/05/14 12:02:56 1.44
+++ pkgsrc/lang/openjdk11/Makefile 2022/08/28 13:58:00 1.44.2.1
@@ -1,204 +1,203 @@ @@ -1,204 +1,203 @@
1# $NetBSD: Makefile,v 1.44 2022/05/14 12:02:56 tnn Exp $ 1# $NetBSD: Makefile,v 1.44.2.1 2022/08/28 13:58:00 spz Exp $
2 2
3DISTNAME= jdk11u-${GITHUB_TAG:C/\+/-/} 3DISTNAME= 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= 1 
6CATEGORIES= lang 5CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
8GITHUB_PROJECT= jdk11u 7GITHUB_PROJECT= jdk11u
9GITHUB_TAG= jdk-11.0.15+10-1 8GITHUB_TAG= jdk-11.0.16+8-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 \
23 jrunscript jshell jstack jstat jstatd keytool rmid \ 22 jrunscript jshell jstack jstat jstatd keytool rmid \
24 rmiregistry serialver 23 rmiregistry serialver
25 24
26BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts 25BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
27 26
28GNU_CONFIGURE= yes 27GNU_CONFIGURE= yes
29GNU_CONFIGURE_STRICT= no # generates the configure script during the build 28GNU_CONFIGURE_STRICT= no # generates the configure script during the build
30USE_GNU_CONFIGURE_HOST= no 29USE_GNU_CONFIGURE_HOST= no
31CONFIGURE_SCRIPT= configure 30CONFIGURE_SCRIPT= configure
32CONFIG_SHELL= bash 31CONFIG_SHELL= bash
33CONFIG_SUB_OVERRIDE+= make/autoconf/build-aux/config.sub 32CONFIG_SUB_OVERRIDE+= make/autoconf/build-aux/config.sub
34CONFIG_GUESS_OVERRIDE+= make/autoconf/build-aux/config.guess 33CONFIG_GUESS_OVERRIDE+= make/autoconf/build-aux/config.guess
35CONFIG_SUB_OVERRIDE+= make/autoconf/build-aux/autoconf-config.sub 34CONFIG_SUB_OVERRIDE+= make/autoconf/build-aux/autoconf-config.sub
36CONFIG_GUESS_OVERRIDE+= make/autoconf/build-aux/autoconf-config.guess 35CONFIG_GUESS_OVERRIDE+= make/autoconf/build-aux/autoconf-config.guess
37USE_LANGUAGES= c c++ 36USE_LANGUAGES= c c++
38USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run autoconf automake 37USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run autoconf automake
39UNLIMIT_RESOURCES= datasize stacksize virtualsize cputime 38UNLIMIT_RESOURCES= datasize stacksize virtualsize cputime
40 39
41BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR} 40BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
42 41
43# Try to use less POSIX semaphores (large MAKE_JOBS can consume them all) 42# Try to use less POSIX semaphores (large MAKE_JOBS can consume them all)
44BOOT_JVMARGS= -XX:+UnlockDiagnosticVMOptions \ 43BOOT_JVMARGS= -XX:+UnlockDiagnosticVMOptions \
45 -XX:-UseSemaphoreGCThreadsSynchronization 44 -XX:-UseSemaphoreGCThreadsSynchronization
46 45
47CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 46CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
48CONFIGURE_ARGS+= --openjdk-target=${MACHINE_GNU_PLATFORM:Q} 47CONFIGURE_ARGS+= --openjdk-target=${MACHINE_GNU_PLATFORM:Q}
49CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR} 48CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR}
50CONFIGURE_ARGS+= --with-boot-jdk-jvmargs=${BOOT_JVMARGS:Q} 49CONFIGURE_ARGS+= --with-boot-jdk-jvmargs=${BOOT_JVMARGS:Q}
51CONFIGURE_ARGS+= --with-zlib=system 50CONFIGURE_ARGS+= --with-zlib=system
52CONFIGURE_ARGS+= --with-giflib=bundled 51CONFIGURE_ARGS+= --with-giflib=bundled
53CONFIGURE_ARGS+= --with-lcms=bundled 52CONFIGURE_ARGS+= --with-lcms=bundled
54CONFIGURE_ARGS+= --with-cups-include=${BUILDLINK_PREFIX.libcups}/include 53CONFIGURE_ARGS+= --with-cups-include=${BUILDLINK_PREFIX.libcups}/include
55CONFIGURE_ARGS+= --with-freetype=system 54CONFIGURE_ARGS+= --with-freetype=system
56CONFIGURE_ARGS+= --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib 55CONFIGURE_ARGS+= --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib
57CONFIGURE_ARGS+= --with-freetype-include=${BUILDLINK_PREFIX.freetype2}/include 56CONFIGURE_ARGS+= --with-freetype-include=${BUILDLINK_PREFIX.freetype2}/include
58CONFIGURE_ARGS+= --with-jobs=${MAKE_JOBS:U1} 57CONFIGURE_ARGS+= --with-jobs=${MAKE_JOBS:U1}
59CONFIGURE_ARGS+= --with-num-cores=${MAKE_JOBS:U1} 58CONFIGURE_ARGS+= --with-num-cores=${MAKE_JOBS:U1}
60CONFIGURE_ARGS+= --disable-precompiled-headers 59CONFIGURE_ARGS+= --disable-precompiled-headers
61CONFIGURE_ARGS+= --disable-ccache 60CONFIGURE_ARGS+= --disable-ccache
62CONFIGURE_ARGS+= --disable-javac-server 61CONFIGURE_ARGS+= --disable-javac-server
63# Do not include ${PREFIX} (/usr/pkg) for internal libraries. 62# Do not include ${PREFIX} (/usr/pkg) for internal libraries.
64#CONFIGURE_ARGS+= --with-extra-ldflags=${LDFLAGS:Q} 63#CONFIGURE_ARGS+= --with-extra-ldflags=${LDFLAGS:Q}
65CONFIGURE_ARGS+= --with-extra-cflags=${CFLAGS:Q} 64CONFIGURE_ARGS+= --with-extra-cflags=${CFLAGS:Q}
66CONFIGURE_ARGS+= --with-extra-cxxflags=${CXXFLAGS:Q} 65CONFIGURE_ARGS+= --with-extra-cxxflags=${CXXFLAGS:Q}
67CONFIGURE_ARGS+= --disable-warnings-as-errors 66CONFIGURE_ARGS+= --disable-warnings-as-errors
68CONFIGURE_ARGS+= --with-cacerts-file=${WRKDIR}/cacerts.out 67CONFIGURE_ARGS+= --with-cacerts-file=${WRKDIR}/cacerts.out
69CONFIGURE_ARGS+= --with-default-make-target=product-images 68CONFIGURE_ARGS+= --with-default-make-target=product-images
70# It is intentional to use CONFIGURE_ARGS instead of CONFIGURE_ENV here. 69# It is intentional to use CONFIGURE_ARGS instead of CONFIGURE_ENV here.
71CONFIGURE_ARGS+= USER=pkgsrc 70CONFIGURE_ARGS+= USER=pkgsrc
72 71
73.include "../../mk/bsd.prefs.mk" 72.include "../../mk/bsd.prefs.mk"
74 73
75# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user. 74# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
76MAKE_ENV+= JAVA_HOME= 75MAKE_ENV+= JAVA_HOME=
77MAKE_ENV+= CLASSPATH= 76MAKE_ENV+= CLASSPATH=
78.if !empty(MACHINE_PLATFORM:MNetBSD-9.99.8[1-9]-*) || \ 77.if !empty(MACHINE_PLATFORM:MNetBSD-9.99.8[1-9]-*) || \
79 !empty(MACHINE_PLATFORM:MNetBSD-9.99.9[0-9]-*) 78 !empty(MACHINE_PLATFORM:MNetBSD-9.99.9[0-9]-*)
80ALL_ENV+= SED="sed -g" 79ALL_ENV+= SED="sed -g"
81.endif 80.endif
82 81
83BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/} 82BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/}
84BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} 83BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
85BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL} 84BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
86BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib 85BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib
87BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib/server 86BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib/server
88WRKSRC= ${WRKDIR}/${DISTNAME} 87WRKSRC= ${WRKDIR}/${DISTNAME}
89 88
90.include "../../mk/compiler.mk" 89.include "../../mk/compiler.mk"
91 90
92.if !empty(PKGSRC_COMPILER:Mclang) 91.if !empty(PKGSRC_COMPILER:Mclang)
93CONFIGURE_ARGS+= --with-toolchain-type=clang 92CONFIGURE_ARGS+= --with-toolchain-type=clang
94_WRAP_EXTRA_ARGS.CC+= -Wno-format-nonliteral -Wno-sign-compare -Wno-char-subscripts 93_WRAP_EXTRA_ARGS.CC+= -Wno-format-nonliteral -Wno-sign-compare -Wno-char-subscripts
95CWRAPPERS_APPEND.cc+= -Wno-format-nonliteral -Wno-sign-compare -Wno-char-subscripts 94CWRAPPERS_APPEND.cc+= -Wno-format-nonliteral -Wno-sign-compare -Wno-char-subscripts
96_WRAP_EXTRA_ARGS.CXX+= -Wno-tautological-undefined-compare 95_WRAP_EXTRA_ARGS.CXX+= -Wno-tautological-undefined-compare
97CWRAPPERS_APPEND.cxx+= -Wno-tautological-undefined-compare 96CWRAPPERS_APPEND.cxx+= -Wno-tautological-undefined-compare
98 97
99BUILDLINK_TRANSFORM+= rm:-fcheck-new 98BUILDLINK_TRANSFORM+= rm:-fcheck-new
100BUILDLINK_TRANSFORM+= rm:-fpch-deps 99BUILDLINK_TRANSFORM+= rm:-fpch-deps
101. if ${MACHINE_ARCH} == "x86_64" 100. if ${MACHINE_ARCH} == "x86_64"
102_WRAP_EXTRA_ARGS.CXX+= -mstackrealign 101_WRAP_EXTRA_ARGS.CXX+= -mstackrealign
103CWRAPPERS_APPEND.cxx+= -mstackrealign 102CWRAPPERS_APPEND.cxx+= -mstackrealign
104. endif 103. endif
105.else 104.else
106# GCC 105# GCC
107CONFIGURE_ARGS+= --with-toolchain-type=gcc 106CONFIGURE_ARGS+= --with-toolchain-type=gcc
108.endif 107.endif
109 108
110.include "bootstrap.mk" 109.include "bootstrap.mk"
111.include "options.mk" 110.include "options.mk"
112 111
113SUBST_CLASSES+= libpath 112SUBST_CLASSES+= libpath
114SUBST_STAGE.libpath= pre-configure 113SUBST_STAGE.libpath= pre-configure
115SUBST_FILES.libpath+= src/hotspot/os/bsd/os_bsd.cpp 114SUBST_FILES.libpath+= src/hotspot/os/bsd/os_bsd.cpp
116SUBST_FILES.libpath+= make/autoconf/flags-cflags.m4 115SUBST_FILES.libpath+= make/autoconf/flags-cflags.m4
117SUBST_FILES.libpath+= make/autoconf/lib-bundled.m4 116SUBST_FILES.libpath+= make/autoconf/lib-bundled.m4
118SUBST_FILES.libpath+= make/autoconf/lib-freetype.m4 117SUBST_FILES.libpath+= make/autoconf/lib-freetype.m4
119SUBST_FILES.libpath+= make/autoconf/lib-x11.m4 118SUBST_FILES.libpath+= make/autoconf/lib-x11.m4
120SUBST_VARS.libpath= PREFIX COMPILER_RPATH_FLAG JAVA_NAME BUILDLINK_PREFIX.zlib X11BASE 119SUBST_VARS.libpath= PREFIX COMPILER_RPATH_FLAG JAVA_NAME BUILDLINK_PREFIX.zlib X11BASE
121 120
122SUBST_CLASSES+= fontpaths 121SUBST_CLASSES+= fontpaths
123SUBST_STAGE.fontpaths= pre-configure 122SUBST_STAGE.fontpaths= pre-configure
124SUBST_MESSAGE.fontpaths= fixing font paths 123SUBST_MESSAGE.fontpaths= fixing font paths
125SUBST_FILES.fontpaths= make/data/fontconfig/bsd.fontconfig.properties 124SUBST_FILES.fontpaths= make/data/fontconfig/bsd.fontconfig.properties
126SUBST_FILES.fontpaths+= src/java.desktop/unix/native/common/awt/fontpath.c 125SUBST_FILES.fontpaths+= src/java.desktop/unix/native/common/awt/fontpath.c
127SUBST_VARS.fontpaths= PREFIX BUILDLINK_PREFIX.fontconfig 126SUBST_VARS.fontpaths= PREFIX BUILDLINK_PREFIX.fontconfig
128 127
129.if ${OPSYS} == "NetBSD" 128.if ${OPSYS} == "NetBSD"
130# NetBSD's EVFILT_* EV_* are different from FreeBSD/OpenBSD's values. 129# NetBSD's EVFILT_* EV_* are different from FreeBSD/OpenBSD's values.
131SUBST_CLASSES+= kqueue 130SUBST_CLASSES+= kqueue
132SUBST_STAGE.kqueue= pre-configure 131SUBST_STAGE.kqueue= pre-configure
133SUBST_MESSAGE.kqueue= fixing kqueue filter values 132SUBST_MESSAGE.kqueue= fixing kqueue filter values
134SUBST_FILES.kqueue= src/java.base/bsd/classes/sun/nio/ch/KQueue.java 133SUBST_FILES.kqueue= src/java.base/bsd/classes/sun/nio/ch/KQueue.java
135SUBST_SED.kqueue= -e 's/static final int EVFILT_READ = -1;/static final int EVFILT_READ = 0;/' 134SUBST_SED.kqueue= -e 's/static final int EVFILT_READ = -1;/static final int EVFILT_READ = 0;/'
136SUBST_SED.kqueue+= -e 's/static final int EVFILT_WRITE = -2;/static final int EVFILT_WRITE = 1;/' 135SUBST_SED.kqueue+= -e 's/static final int EVFILT_WRITE = -2;/static final int EVFILT_WRITE = 1;/'
137SUBST_SED.kqueue+= -e 's/static final int EV_ONESHOT = 0x0010;/static final int EV_ONESHOT = 0x0004;/' 136SUBST_SED.kqueue+= -e 's/static final int EV_ONESHOT = 0x0010;/static final int EV_ONESHOT = 0x0004;/'
138SUBST_SED.kqueue+= -e 's/static final int EV_CLEAR = 0x0020;/static final int EV_CLEAR = 0x0008;/' 137SUBST_SED.kqueue+= -e 's/static final int EV_CLEAR = 0x0020;/static final int EV_CLEAR = 0x0008;/'
139.endif 138.endif
140 139
141PLIST_VARS+= aot internal_vm_compiler jvmci 140PLIST_VARS+= aot internal_vm_compiler jvmci
142.if ${MACHINE_ARCH} == "x86_64" 141.if ${MACHINE_ARCH} == "x86_64"
143PLIST.aot= yes 142PLIST.aot= yes
144PLIST.internal_vm_compiler= yes 143PLIST.internal_vm_compiler= yes
145PLIST.jvmci= yes 144PLIST.jvmci= yes
146.endif 145.endif
147.if ${MACHINE_ARCH} == "aarch64" 146.if ${MACHINE_ARCH} == "aarch64"
148PLIST.internal_vm_compiler= yes 147PLIST.internal_vm_compiler= yes
149PLIST.jvmci= yes 148PLIST.jvmci= yes
150.endif 149.endif
151 150
152.if ${OPSYS} == "NetBSD" 151.if ${OPSYS} == "NetBSD"
153TOOLS_PLATFORM.unzip= 152TOOLS_PLATFORM.unzip=
154.endif 153.endif
155 154
156post-extract: 155post-extract:
157# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with 156# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with
158# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base. 157# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base.
159.if exists(/lib/libgcc_s.so.1) 158.if exists(/lib/libgcc_s.so.1)
160 ${RM} -f ${ALT_BOOTDIR}/lib/libgcc_s.so* 159 ${RM} -f ${ALT_BOOTDIR}/lib/libgcc_s.so*
161.endif 160.endif
162 161
163pre-configure: ${WRKDIR}/cacerts.out 162pre-configure: ${WRKDIR}/cacerts.out
164 163
165${WRKDIR}/cacerts.out: 164${WRKDIR}/cacerts.out:
166 mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \ 165 mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \
167 ${PREFIX}/sbin/mozilla-rootcerts extract 166 ${PREFIX}/sbin/mozilla-rootcerts extract
168 ${_ULIMIT_CMD} for cert in ${WRKDIR}/cacerts/*.pem; do \ 167 ${_ULIMIT_CMD} for cert in ${WRKDIR}/cacerts/*.pem; do \
169 ${INFO_MSG} "Importing $$cert" && \ 168 ${INFO_MSG} "Importing $$cert" && \
170 ${SETENV} ${CONFIGURE_ENV} LC_ALL=C \ 169 ${SETENV} ${CONFIGURE_ENV} LC_ALL=C \
171 ${ALT_BOOTDIR}/bin/keytool \ 170 ${ALT_BOOTDIR}/bin/keytool \
172 -noprompt \ 171 -noprompt \
173 -importcert \ 172 -importcert \
174 -keystore ${.TARGET}.tmp \ 173 -keystore ${.TARGET}.tmp \
175 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \ 174 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \
176 -file $$cert \ 175 -file $$cert \
177 -storetype jks \ 176 -storetype jks \
178 -storepass changeit; \ 177 -storepass changeit; \
179 done 178 done
180 mv ${.TARGET}.tmp ${.TARGET} 179 mv ${.TARGET}.tmp ${.TARGET}
181 180
182do-build: 181do-build:
183 rm -f ${WRKSRC}/make/data/fontconfig/*.orig 182 rm -f ${WRKSRC}/make/data/fontconfig/*.orig
184 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib ${MAKE_PROGRAM} 183 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${ALT_BOOTDIR}/lib ${MAKE_PROGRAM}
185 184
186do-install: 185do-install:
187 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME} 186 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}
188 cd ${BUILDDIR}/images/jdk && pax -rwpp . \ 187 cd ${BUILDDIR}/images/jdk && pax -rwpp . \
189 ${DESTDIR}${JAVA_HOME}/. 188 ${DESTDIR}${JAVA_HOME}/.
190 189
191.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 190.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
192.include "../../audio/alsa-lib/buildlink3.mk" 191.include "../../audio/alsa-lib/buildlink3.mk"
193CONFIGURE_ARGS+= --with-alsa=${BUILDLINK_PREFIX.alsa-lib} 192CONFIGURE_ARGS+= --with-alsa=${BUILDLINK_PREFIX.alsa-lib}
194.endif 193.endif
195.include "../../converters/libiconv/buildlink3.mk" 194.include "../../converters/libiconv/buildlink3.mk"
196.include "../../devel/zlib/buildlink3.mk" 195.include "../../devel/zlib/buildlink3.mk"
197.include "../../fonts/fontconfig/buildlink3.mk" 196.include "../../fonts/fontconfig/buildlink3.mk"
198.include "../../graphics/freetype2/buildlink3.mk" 197.include "../../graphics/freetype2/buildlink3.mk"
199# Headers from CUPS are required to build the native implementation of 198# Headers from CUPS are required to build the native implementation of
200# sun.print.* which is used by java.awt.print. 199# sun.print.* which is used by java.awt.print.
201BUILDLINK_DEPMETHOD.libcups?= build 200BUILDLINK_DEPMETHOD.libcups?= build
202.include "../../print/libcups/buildlink3.mk" 201.include "../../print/libcups/buildlink3.mk"
203.include "../../mk/java-env.mk" 202.include "../../mk/java-env.mk"
204.include "../../mk/bsd.pkg.mk" 203.include "../../mk/bsd.pkg.mk"
cvs diff -r1.34 -r1.34.2.1 pkgsrc/lang/openjdk11/distinfo (switch to unified diff)

--- pkgsrc/lang/openjdk11/distinfo 2022/05/25 19:53:26 1.34
+++ pkgsrc/lang/openjdk11/distinfo 2022/08/28 13:58:00 1.34.2.1
@@ -1,38 +1,31 @@ @@ -1,38 +1,31 @@
1$NetBSD: distinfo,v 1.34 2022/05/25 19:53:26 tnn Exp $ 1$NetBSD: distinfo,v 1.34.2.1 2022/08/28 13:58:00 spz Exp $
2 2
3BLAKE2s (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = f93572f551f242344e5d6d5e46b9812e5b426772842b5fa06fea4422e327c871 3BLAKE2s (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = f93572f551f242344e5d6d5e46b9812e5b426772842b5fa06fea4422e327c871
4SHA512 (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = c4030c99e4c1bb209f0c1ca6c10665c3f4c906f9d7dc13b912c3fbb8031f3dbb6f8d2e5e966cbbc452c307ba5d6de816c0f000b5b7c5d4e3fe8511baf12aab49 4SHA512 (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = c4030c99e4c1bb209f0c1ca6c10665c3f4c906f9d7dc13b912c3fbb8031f3dbb6f8d2e5e966cbbc452c307ba5d6de816c0f000b5b7c5d4e3fe8511baf12aab49
5Size (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = 92279544 bytes 5Size (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = 92279544 bytes
6BLAKE2s (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = b57b09661581b7dc6e3700a777f030dfa2fef6f953533456686bfd0dde9157d0 6BLAKE2s (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = b57b09661581b7dc6e3700a777f030dfa2fef6f953533456686bfd0dde9157d0
7SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 6e61996f7e3c3492b0c878644db30d72021dc4096639992e53b4440d4e2e18cd92e5630ecd4600d1917a1e63a7c814b63f74f811a40588febfe19ad8d3208a9d 7SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 6e61996f7e3c3492b0c878644db30d72021dc4096639992e53b4440d4e2e18cd92e5630ecd4600d1917a1e63a7c814b63f74f811a40588febfe19ad8d3208a9d
8Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 105760636 bytes 8Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 105760636 bytes
9BLAKE2s (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = c54603eabe28bae659a2042cb3b69588840a57502e741c3de333ac70ea1dedc2 9BLAKE2s (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = c54603eabe28bae659a2042cb3b69588840a57502e741c3de333ac70ea1dedc2
10SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 1bf5336e9bfeea9ecbcd347f2ea8dd3c9633df42cab13a09c7afaae94faa95b92d862dd97caf380a7037825c3324377240d5d0639b2e0b31a2d7a6316ed56359 10SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 1bf5336e9bfeea9ecbcd347f2ea8dd3c9633df42cab13a09c7afaae94faa95b92d862dd97caf380a7037825c3324377240d5d0639b2e0b31a2d7a6316ed56359
11Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes 11Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes
12BLAKE2s (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 5aac0ec747ac714032dfcb4cc4f093ee3f9ddeb070301856727a8597cedd65cf 12BLAKE2s (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 5aac0ec747ac714032dfcb4cc4f093ee3f9ddeb070301856727a8597cedd65cf
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
15BLAKE2s (jdk11u-jdk-11.0.15-10-1.tar.gz) = 1ead16eff10210e68cd9c1407a9d729e248bb1ff075606d7fe3e5e62e4cde42d 15BLAKE2s (jdk11u-jdk-11.0.16-8-1.tar.gz) = 335896a9a7c173f9e6d69b7e2bd2b98e773cfe5dc997bfb2ec367d13fe39be58
16SHA512 (jdk11u-jdk-11.0.15-10-1.tar.gz) = f2d3b5cea79d737c7f4c5cdd2924aa7fd69fa6fb02fc8672f21060452f7483dc09157a7828642b3e43b033c26eaba0507ddd50491daceb6cf176cea47333857a 16SHA512 (jdk11u-jdk-11.0.16-8-1.tar.gz) = 33954a05fa8e2a2f0fb97db311569a6b6b9133450d143c78bf01fabee0435b245a9c2318b2c49b8b3023168ba171019e08d5dce5116b6b7c94dad8dd7d047b61
17Size (jdk11u-jdk-11.0.15-10-1.tar.gz) = 123036045 bytes 17Size (jdk11u-jdk-11.0.16-8-1.tar.gz) = 123280743 bytes
18SHA1 (patch-make_autoconf_buildjdk-spec.gmk.in) = d0b600237853c17ecc2864604f0bd847ba6b0149 18SHA1 (patch-make_autoconf_buildjdk-spec.gmk.in) = d0b600237853c17ecc2864604f0bd847ba6b0149
19SHA1 (patch-make_autoconf_flags-cflags.m4) = 3b37853298805e2ffb92d3babd700d0048f24d8d 19SHA1 (patch-make_autoconf_flags-cflags.m4) = 3b37853298805e2ffb92d3babd700d0048f24d8d
20SHA1 (patch-make_autoconf_hotspot.m4) = 437c8b09114933cca22c4a847a90a415cd113e5a 20SHA1 (patch-make_autoconf_hotspot.m4) = 437c8b09114933cca22c4a847a90a415cd113e5a
21SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c381 21SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c381
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 
26SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07 25SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07
27SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d 
28SHA1 (patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp) = 97c6a06d6e957e267969cae3c9ad09c7ab9d0e56 
29SHA1 (patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp) = cfaace9741b0b30daf827119127478a195f8374f 
30SHA1 (patch-src_hotspot_os__cpu_bsd__arm_bsd__arm__32.s) = 474a66abfb25030d4e32134816c14b157d1ebe6a 26SHA1 (patch-src_hotspot_os__cpu_bsd__arm_bsd__arm__32.s) = 474a66abfb25030d4e32134816c14b157d1ebe6a
31SHA1 (patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp) = 8a99417711c4826490954d43f142afc0a0c68e9f 
32SHA1 (patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp) = 384214d554db82dc9092ee8f975aa5a73aae67ab 
33SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 6322cbdda03dee528e89ac8b725f3df5e2165797 27SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 6322cbdda03dee528e89ac8b725f3df5e2165797
34SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a 28SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a
35SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2 29SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2
36SHA1 (patch-src_hotspot_share_libadt_dict.cpp) = a5c62973f563742d4ccc7db341b33366d14e2a01 30SHA1 (patch-src_hotspot_share_libadt_dict.cpp) = a5c62973f563742d4ccc7db341b33366d14e2a01
37SHA1 (patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc) = 6635bba71373f65107f5324f68de41d1320bcad8 
38SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b 31SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b
File Deleted: pkgsrc/lang/openjdk11/patches/Attic/patch-make_common_NativeCompilation.gmk
File Deleted: pkgsrc/lang/openjdk11/patches/Attic/patch-make_lib_Awt2dLibraries.gmk
File Deleted: pkgsrc/lang/openjdk11/patches/Attic/patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp
File Deleted: pkgsrc/lang/openjdk11/patches/Attic/patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp
File Deleted: pkgsrc/lang/openjdk11/patches/Attic/patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp
File Deleted: pkgsrc/lang/openjdk11/patches/Attic/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
File Deleted: pkgsrc/lang/openjdk11/patches/Attic/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
cvs diff -r1.110 -r1.110.6.1 pkgsrc/lang/openjdk8/Makefile (switch to unified diff)

--- pkgsrc/lang/openjdk8/Makefile 2021/12/08 16:05:22 1.110
+++ pkgsrc/lang/openjdk8/Makefile 2022/08/28 13:58:00 1.110.6.1
@@ -1,279 +1,278 @@ @@ -1,279 +1,278 @@
1# $NetBSD: Makefile,v 1.110 2021/12/08 16:05:22 adam Exp $ 1# $NetBSD: Makefile,v 1.110.6.1 2022/08/28 13:58:00 spz Exp $
2 2
3DISTNAME= openjdk-jdk8u-${GITHUB_TAG} 3DISTNAME= jdk8u-${GITHUB_TAG}
4PKGNAME= openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/} 4PKGNAME= openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
5PKGREVISION= 3 
6CATEGORIES= lang 5CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
8MASTER_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} # for bootstrap kits 7MASTER_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} # for bootstrap kits
9GITHUB_PROJECT= openjdk-jdk8u 8GITHUB_PROJECT= jdk8u
10GITHUB_TAG= jdk8u292-b10.2 9GITHUB_TAG= jdk8u342-b07.1
11 10
12MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://openjdk.java.net/ 12HOMEPAGE= https://openjdk.java.net/
14COMMENT= Open-source implementation of the Java Platform, Standard Edition 13COMMENT= Open-source implementation of the Java Platform, Standard Edition
15LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
16 15
17DISTFILES= ${DEFAULT_DISTFILES} 16DISTFILES= ${DEFAULT_DISTFILES}
18EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 17EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
19 18
20# Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles 19# Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles
21DIST_SUBDIR= openjdk7 20DIST_SUBDIR= openjdk7
22 21
23JAVA_NAME= openjdk8 22JAVA_NAME= openjdk8
24JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} 23JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
25JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jmap jps jstack \ 24JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jmap jps jstack \
26 keytool orbd policytool rmid rmiregistry servertool tnameserv 25 keytool orbd policytool rmid rmiregistry servertool tnameserv
27 26
28BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts 27BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
29 28
30GNU_CONFIGURE= yes 29GNU_CONFIGURE= yes
31GNU_CONFIGURE_STRICT= no # not really GNU configure, only similar 30GNU_CONFIGURE_STRICT= no # not really GNU configure, only similar
32USE_GNU_CONFIGURE_HOST= no 31USE_GNU_CONFIGURE_HOST= no
33CONFIGURE_SCRIPT= configure 32CONFIGURE_SCRIPT= configure
34CONFIG_SHELL= bash 33CONFIG_SHELL= bash
35CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub 34CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub
36CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess 35CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess
37CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/autoconf-config.sub 36CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/autoconf-config.sub
38CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess 37CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess
39USE_LANGUAGES= c c++ 38USE_LANGUAGES= c c++
40USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run 39USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run
41UNLIMIT_RESOURCES= datasize stacksize virtualsize cputime 40UNLIMIT_RESOURCES= datasize stacksize virtualsize cputime
42PLIST_SRC+= ${PLIST_SRC_DFLT} 41PLIST_SRC+= ${PLIST_SRC_DFLT}
43CHECK_SHLIBS_SKIP+= java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}/libinstrument.so 42CHECK_SHLIBS_SKIP+= java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}/libinstrument.so
44 43
45BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR} 44BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
46PREPEND_PATH+= ${ALT_BOOTDIR}/bin 45PREPEND_PATH+= ${ALT_BOOTDIR}/bin
47 46
48BUILDLINK_TRANSFORM+= rm:-Werror 47BUILDLINK_TRANSFORM+= rm:-Werror
49 48
50# hotspot/src/share/vm/adlc/dict2.cpp does that, but it's safe. 49# hotspot/src/share/vm/adlc/dict2.cpp does that, but it's safe.
51BUILDLINK_TRANSFORM+= rm:-Werror=char-subscripts 50BUILDLINK_TRANSFORM+= rm:-Werror=char-subscripts
52 51
53CONFIGURE_ARGS+= --disable-option-checking # for --with-libiconv-prefix 52CONFIGURE_ARGS+= --disable-option-checking # for --with-libiconv-prefix
54CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 53CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
55CONFIGURE_ARGS+= --openjdk-target=${MACHINE_GNU_PLATFORM:Q} 54CONFIGURE_ARGS+= --openjdk-target=${MACHINE_GNU_PLATFORM:Q}
56CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR} 55CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR}
57CONFIGURE_ARGS+= --with-zlib=system 56CONFIGURE_ARGS+= --with-zlib=system
58CONFIGURE_ARGS+= --with-giflib=bundled 57CONFIGURE_ARGS+= --with-giflib=bundled
59CONFIGURE_ARGS+= --with-cups-include=${BUILDLINK_PREFIX.libcups}/include 58CONFIGURE_ARGS+= --with-cups-include=${BUILDLINK_PREFIX.libcups}/include
60CONFIGURE_ARGS+= --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib 59CONFIGURE_ARGS+= --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib
61CONFIGURE_ARGS+= --with-freetype-include=${BUILDLINK_PREFIX.freetype2}/include 60CONFIGURE_ARGS+= --with-freetype-include=${BUILDLINK_PREFIX.freetype2}/include
62CONFIGURE_ARGS+= --disable-freetype-bundling 61CONFIGURE_ARGS+= --disable-freetype-bundling
63CONFIGURE_ARGS+= --with-jobs=${MAKE_JOBS:U1} 62CONFIGURE_ARGS+= --with-jobs=${MAKE_JOBS:U1}
64CONFIGURE_ARGS+= --with-num-cores=${MAKE_JOBS:U1} 63CONFIGURE_ARGS+= --with-num-cores=${MAKE_JOBS:U1}
65CONFIGURE_ARGS+= --with-memory-size=768 64CONFIGURE_ARGS+= --with-memory-size=768
66CONFIGURE_ARGS+= --disable-precompiled-headers 65CONFIGURE_ARGS+= --disable-precompiled-headers
67CONFIGURE_ARGS+= --disable-ccache 66CONFIGURE_ARGS+= --disable-ccache
68CONFIGURE_ARGS+= --with-user-release-suffix=pkgsrc_${PKGVERSION} 67CONFIGURE_ARGS+= --with-user-release-suffix=pkgsrc_${PKGVERSION}
69CONFIGURE_ARGS+= --with-update-version=${PKGVERSION_NOREV:S/1.8.//} 68CONFIGURE_ARGS+= --with-update-version=${PKGVERSION_NOREV:S/1.8.//}
70CONFIGURE_ARGS+= --with-extra-ldflags=${LDFLAGS:Q} 69CONFIGURE_ARGS+= --with-extra-ldflags=${LDFLAGS:Q}
71 70
72CHECK_PORTABILITY_SKIP+= hotspot/test/runtime/*/*.sh 71CHECK_PORTABILITY_SKIP+= hotspot/test/runtime/*/*.sh
73CHECK_PORTABILITY_SKIP+= hotspot/test/compiler/*/*/*.sh 72CHECK_PORTABILITY_SKIP+= hotspot/test/compiler/*/*/*.sh
74 73
75# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user. 74# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
76MAKE_ENV+= JAVA_HOME= 75MAKE_ENV+= JAVA_HOME=
77MAKE_ENV+= CLASSPATH= 76MAKE_ENV+= CLASSPATH=
78 77
79BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/} 78BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/}
80BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} 79BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
81LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} 80LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
82BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL} 81BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
83LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server 82LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server
84CONFIGURE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 83CONFIGURE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
85MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 84MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
86CONFIGURE_ENV+= LFLAGS=${LDFLAGS:Q} 85CONFIGURE_ENV+= LFLAGS=${LDFLAGS:Q}
87MAKE_ENV+= LFLAGS=${LDFLAGS:Q} 86MAKE_ENV+= LFLAGS=${LDFLAGS:Q}
88BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH} 87BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}
89 88
90PLIST_SUBST+= ARCH=${LIBDIR_ARCH} 89PLIST_SUBST+= ARCH=${LIBDIR_ARCH}
91PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS:S/sunos/solaris/} 90PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS:S/sunos/solaris/}
92 91
93.include "../../mk/compiler.mk" 92.include "../../mk/compiler.mk"
94 93
95SUBST_CLASSES+= libpath 94SUBST_CLASSES+= libpath
96SUBST_STAGE.libpath= pre-build 95SUBST_STAGE.libpath= pre-build
97SUBST_FILES.libpath+= hotspot/src/os/bsd/vm/os_bsd.cpp 96SUBST_FILES.libpath+= hotspot/src/os/bsd/vm/os_bsd.cpp
98SUBST_VARS.libpath= PREFIX 97SUBST_VARS.libpath= PREFIX
99 98
100CFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS 99CFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
101CXXFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS 100CXXFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
102 101
103CONFIGURE_ENV+= CFLAGS_JDK=${CFLAGS:Q} 102CONFIGURE_ENV+= CFLAGS_JDK=${CFLAGS:Q}
104CONFIGURE_ENV+= CXXFLAGS_JDK=${CXXFLAGS:Q} 103CONFIGURE_ENV+= CXXFLAGS_JDK=${CXXFLAGS:Q}
105 104
106.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc) 105.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
107MAKE_ENV+= USE_GCC=1 106MAKE_ENV+= USE_GCC=1
108MAKE_ENV+= ARCH_DATA_MODEL=${ABI:Q} 107MAKE_ENV+= ARCH_DATA_MODEL=${ABI:Q}
109.endif 108.endif
110 109
111.if !empty(PKGSRC_COMPILER:Mclang) 110.if !empty(PKGSRC_COMPILER:Mclang)
112CONFIGURE_ARGS+= --with-toolchain-type=clang 111CONFIGURE_ARGS+= --with-toolchain-type=clang
113MAKE_ENV+= USE_CLANG=true 112MAKE_ENV+= USE_CLANG=true
114_WRAP_EXTRA_ARGS.CC+= -Wno-return-type 113_WRAP_EXTRA_ARGS.CC+= -Wno-return-type
115CWRAPPERS_APPEND.cc+= -Wno-return-type 114CWRAPPERS_APPEND.cc+= -Wno-return-type
116_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \ 115_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \
117 -Wno-shorten-64-to-32 -Wno-conversion \ 116 -Wno-shorten-64-to-32 -Wno-conversion \
118 -Wno-unused-value -Wno-switch-enum -Wno-switch \ 117 -Wno-unused-value -Wno-switch-enum -Wno-switch \
119 -Wno-tautological-compare \ 118 -Wno-tautological-compare \
120 -Wno-delete-non-virtual-dtor \ 119 -Wno-delete-non-virtual-dtor \
121 -Wno-return-type -Wno-unused-parameter \ 120 -Wno-return-type -Wno-unused-parameter \
122 -Wno-parentheses-equality -Wno-empty-body \ 121 -Wno-parentheses-equality -Wno-empty-body \
123 -Wno-format -Wno-dynamic-class-memaccess 122 -Wno-format -Wno-dynamic-class-memaccess
124CWRAPPERS_APPEND.cxx+= -Wno-parentheses -Wno-sign-conversion \ 123CWRAPPERS_APPEND.cxx+= -Wno-parentheses -Wno-sign-conversion \
125 -Wno-shorten-64-to-32 -Wno-conversion \ 124 -Wno-shorten-64-to-32 -Wno-conversion \
126 -Wno-unused-value -Wno-switch-enum -Wno-switch \ 125 -Wno-unused-value -Wno-switch-enum -Wno-switch \
127 -Wno-tautological-compare \ 126 -Wno-tautological-compare \
128 -Wno-delete-non-virtual-dtor \ 127 -Wno-delete-non-virtual-dtor \
129 -Wno-return-type -Wno-unused-parameter \ 128 -Wno-return-type -Wno-unused-parameter \
130 -Wno-parentheses-equality -Wno-empty-body \ 129 -Wno-parentheses-equality -Wno-empty-body \
131 -Wno-format -Wno-dynamic-class-memaccess 130 -Wno-format -Wno-dynamic-class-memaccess
132. if ${OPSYS} != "FreeBSD" 131. if ${OPSYS} != "FreeBSD"
133_WRAP_EXTRA_ARGS.CXX+= -Wno-new-returns-null 132_WRAP_EXTRA_ARGS.CXX+= -Wno-new-returns-null
134CWRAPPERS_APPEND.cxx+= -Wno-new-returns-null 133CWRAPPERS_APPEND.cxx+= -Wno-new-returns-null
135. endif 134. endif
136BUILDLINK_TRANSFORM+= rm:-fcheck-new 135BUILDLINK_TRANSFORM+= rm:-fcheck-new
137BUILDLINK_TRANSFORM+= rm:-fpch-deps 136BUILDLINK_TRANSFORM+= rm:-fpch-deps
138. if ${MACHINE_ARCH} == "x86_64" 137. if ${MACHINE_ARCH} == "x86_64"
139_WRAP_EXTRA_ARGS.CXX+= -mstackrealign 138_WRAP_EXTRA_ARGS.CXX+= -mstackrealign
140CWRAPPERS_APPEND.cxx+= -mstackrealign 139CWRAPPERS_APPEND.cxx+= -mstackrealign
141. endif 140. endif
142.else 141.else
143# GCC 142# GCC
144CONFIGURE_ARGS+= --with-toolchain-type=gcc 143CONFIGURE_ARGS+= --with-toolchain-type=gcc
145.endif 144.endif
146.include "bootstrap.mk" 145.include "bootstrap.mk"
147 146
148.include "options.mk" 147.include "options.mk"
149 148
150SUBST_CLASSES+= fontpaths 149SUBST_CLASSES+= fontpaths
151SUBST_STAGE.fontpaths= pre-build 150SUBST_STAGE.fontpaths= pre-build
152SUBST_MESSAGE.fontpaths= fixing font paths 151SUBST_MESSAGE.fontpaths= fixing font paths
153SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties 152SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
154SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c 153SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c
155SUBST_VARS.fontpaths= PREFIX 154SUBST_VARS.fontpaths= PREFIX
156SUBST_VARS.fontpaths+= BUILDLINK_PREFIX.fontconfig 155SUBST_VARS.fontpaths+= BUILDLINK_PREFIX.fontconfig
157 156
158SUBST_CLASSES+= zlibpath 157SUBST_CLASSES+= zlibpath
159SUBST_STAGE.zlibpath= pre-build 158SUBST_STAGE.zlibpath= pre-build
160SUBST_FILES.zlibpath= jdk/make/CompileLaunchers.gmk jdk/make/lib/CoreLibraries.gmk 159SUBST_FILES.zlibpath= jdk/make/CompileLaunchers.gmk jdk/make/lib/CoreLibraries.gmk
161SUBST_FILES.zlibpath+= jdk/make/lib/Awt2dLibraries.gmk 160SUBST_FILES.zlibpath+= jdk/make/lib/Awt2dLibraries.gmk
162SUBST_VARS.zlibpath= COMPILER_RPATH_FLAG BUILDLINK_PREFIX.zlib 161SUBST_VARS.zlibpath= COMPILER_RPATH_FLAG BUILDLINK_PREFIX.zlib
163SUBST_VARS.zlibpath+= BUILDLINK_PREFIX.iconv 162SUBST_VARS.zlibpath+= BUILDLINK_PREFIX.iconv
164 163
165.if ${OPSYS} == "NetBSD" 164.if ${OPSYS} == "NetBSD"
166# NetBSD's EVFILT_* are different from FreeBSD/OpenBSD's values. 165# NetBSD's EVFILT_* are different from FreeBSD/OpenBSD's values.
167SUBST_CLASSES+= kqueue 166SUBST_CLASSES+= kqueue
168SUBST_STAGE.kqueue= pre-configure 167SUBST_STAGE.kqueue= pre-configure
169SUBST_MESSAGE.kqueue= fixing kqueue filter values 168SUBST_MESSAGE.kqueue= fixing kqueue filter values
170SUBST_FILES.kqueue= jdk/src/solaris/classes/sun/nio/ch/KQueue.java 169SUBST_FILES.kqueue= jdk/src/solaris/classes/sun/nio/ch/KQueue.java
171SUBST_SED.kqueue= -e 's/static final int EVFILT_READ = -1;/static final int EVFILT_READ = 0;/' 170SUBST_SED.kqueue= -e 's/static final int EVFILT_READ = -1;/static final int EVFILT_READ = 0;/'
172SUBST_SED.kqueue+= -e 's/static final int EVFILT_WRITE = -2;/static final int EVFILT_WRITE = 1;/' 171SUBST_SED.kqueue+= -e 's/static final int EVFILT_WRITE = -2;/static final int EVFILT_WRITE = 1;/'
173.endif 172.endif
174 173
175PLIST_VARS+= i386 174PLIST_VARS+= i386
176.if ${MACHINE_ARCH} == "i386" 175.if ${MACHINE_ARCH} == "i386"
177PLIST.i386= yes 176PLIST.i386= yes
178.endif 177.endif
179 178
180PLIST_VARS+= sctp 179PLIST_VARS+= sctp
181.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" 180.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
182PLIST.sctp= yes 181PLIST.sctp= yes
183.endif 182.endif
184 183
185post-extract: 184post-extract:
186# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with 185# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with
187# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base. 186# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base.
188.if exists(/lib/libgcc_s.so.1) 187.if exists(/lib/libgcc_s.so.1)
189 ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libgcc_s.so* 188 ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libgcc_s.so*
190.endif 189.endif
191.if exists(/usr/lib/libstdc++.so.7) 190.if exists(/usr/lib/libstdc++.so.7)
192 ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so* 191 ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so*
193.endif 192.endif
194# This can be removed after bootstrap kits have been refreshed 193# This can be removed after bootstrap kits have been refreshed
195.if defined(TOOLS_PLATFORM.paxctl) 194.if defined(TOOLS_PLATFORM.paxctl)
196 ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]* 195 ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]*
197 ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]* 196 ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]*
198 ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/jar* 197 ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/jar*
199 ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java 198 ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java
200 ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]* 199 ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]*
201.endif 200.endif
202 201
203do-build: ${WRKDIR}/stage3-done 202do-build: ${WRKDIR}/stage3-done
204 203
205# stage 1 builds a native JDK using the bootstrap binaries 204# stage 1 builds a native JDK using the bootstrap binaries
206${WRKDIR}/stage1-done: 205${WRKDIR}/stage1-done:
207 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} images 206 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} images
208 rm -rf ${ALT_BOOTDIR} 207 rm -rf ${ALT_BOOTDIR}
209 cd ${BUILDDIR}/images && mv j2sdk-image ${ALT_BOOTDIR} 208 cd ${BUILDDIR}/images && mv j2sdk-image ${ALT_BOOTDIR}
210.for d in corba hotspot jaxp jaxws langtools tmp 209.for d in corba hotspot jaxp jaxws langtools tmp
211 mv ${BUILDDIR}/${d} ${BUILDDIR}/${d}-stage1 210 mv ${BUILDDIR}/${d} ${BUILDDIR}/${d}-stage1
212.endfor 211.endfor
213 touch ${.TARGET} 212 touch ${.TARGET}
214 213
215# stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now 214# stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now
216${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done 215${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done
217 @${STEP_MSG} "Reconfiguring with newly built JDK" 216 @${STEP_MSG} "Reconfiguring with newly built JDK"
218 @${RECURSIVE_MAKE} ${MAKEFLAGS} do-configure 217 @${RECURSIVE_MAKE} ${MAKEFLAGS} do-configure
219 touch ${.TARGET} 218 touch ${.TARGET}
220 219
221# stage 2 rebuilds the JDK using native tools 220# stage 2 rebuilds the JDK using native tools
222${WRKDIR}/stage2-done: ${WRKDIR}/stage1_5-done 221${WRKDIR}/stage2-done: ${WRKDIR}/stage1_5-done
223 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} images 222 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} images
224 touch ${.TARGET} 223 touch ${.TARGET}
225 224
226# stage 3 builds third party add-ons 225# stage 3 builds third party add-ons
227${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out 226${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out
228 touch ${.TARGET} 227 touch ${.TARGET}
229 228
230${WRKDIR}/cacerts.out: 229${WRKDIR}/cacerts.out:
231 mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \ 230 mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \
232 ${PREFIX}/sbin/mozilla-rootcerts extract 231 ${PREFIX}/sbin/mozilla-rootcerts extract
233 for cert in ${WRKDIR}/cacerts/*.pem; do \ 232 for cert in ${WRKDIR}/cacerts/*.pem; do \
234 ${INFO_MSG} "Importing $$cert" && \ 233 ${INFO_MSG} "Importing $$cert" && \
235 ${SETENV} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} LC_ALL=C \ 234 ${SETENV} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} LC_ALL=C \
236 ${ALT_BOOTDIR}/bin/keytool \ 235 ${ALT_BOOTDIR}/bin/keytool \
237 -noprompt \ 236 -noprompt \
238 -importcert \ 237 -importcert \
239 -keystore ${.TARGET} \ 238 -keystore ${.TARGET} \
240 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \ 239 -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \
241 -file $$cert \ 240 -file $$cert \
242 -storepass changeit; \ 241 -storepass changeit; \
243 done 242 done
244 243
245do-install: 244do-install:
246 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME} 245 ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}
247 cd ${BUILDDIR}/images/j2sdk-image && pax -rwpp . \ 246 cd ${BUILDDIR}/images/j2sdk-image && pax -rwpp . \
248 ${DESTDIR}${JAVA_HOME}/. 247 ${DESTDIR}${JAVA_HOME}/.
249 ${INSTALL_DATA} ${WRKDIR}/cacerts.out \ 248 ${INSTALL_DATA} ${WRKDIR}/cacerts.out \
250 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts 249 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts
251 rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h 250 rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h
252 ln -s ${LOWER_OPSYS:S/sunos/solaris/}/jni_md.h \ 251 ln -s ${LOWER_OPSYS:S/sunos/solaris/}/jni_md.h \
253 ${DESTDIR}${JAVA_HOME}/include/jni_md.h 252 ${DESTDIR}${JAVA_HOME}/include/jni_md.h
254 253
255.if ${OPSYS} == "NetBSD" 254.if ${OPSYS} == "NetBSD"
256TOOLS_PLATFORM.unzip= 255TOOLS_PLATFORM.unzip=
257.endif 256.endif
258 257
259# Include binutils for objcopy and GNU strip on SmartOS 258# Include binutils for objcopy and GNU strip on SmartOS
260.if ${OS_VARIANT} == "SmartOS" || ${OS_VARIANT} == "OmniOS" 259.if ${OS_VARIANT} == "SmartOS" || ${OS_VARIANT} == "OmniOS"
261.include "../../devel/binutils/buildlink3.mk" 260.include "../../devel/binutils/buildlink3.mk"
262BUILDLINK_DEPMETHOD.binutils?= build 261BUILDLINK_DEPMETHOD.binutils?= build
263MAKE_ENV+= STRIP=${PREFIX}/bin/gstrip 262MAKE_ENV+= STRIP=${PREFIX}/bin/gstrip
264.endif 263.endif
265 264
266# disabled the ALSA support for now on BSDs via patch 265# disabled the ALSA support for now on BSDs via patch
267.if ${OPSYS} == "Linux" 266.if ${OPSYS} == "Linux"
268.include "../../audio/alsa-lib/buildlink3.mk" 267.include "../../audio/alsa-lib/buildlink3.mk"
269.endif 268.endif
270.include "../../converters/libiconv/buildlink3.mk" 269.include "../../converters/libiconv/buildlink3.mk"
271.include "../../devel/zlib/buildlink3.mk" 270.include "../../devel/zlib/buildlink3.mk"
272.include "../../fonts/fontconfig/buildlink3.mk" 271.include "../../fonts/fontconfig/buildlink3.mk"
273.include "../../graphics/freetype2/buildlink3.mk" 272.include "../../graphics/freetype2/buildlink3.mk"
274# Headers from CUPS are required to build the native implementation of 273# Headers from CUPS are required to build the native implementation of
275# sun.print.* which is used by java.awt.print. 274# sun.print.* which is used by java.awt.print.
276BUILDLINK_DEPMETHOD.libcups?= build 275BUILDLINK_DEPMETHOD.libcups?= build
277.include "../../print/libcups/buildlink3.mk" 276.include "../../print/libcups/buildlink3.mk"
278.include "../../mk/java-env.mk" 277.include "../../mk/java-env.mk"
279.include "../../mk/bsd.pkg.mk" 278.include "../../mk/bsd.pkg.mk"
cvs diff -r1.88 -r1.88.2.1 pkgsrc/lang/openjdk8/distinfo (switch to unified diff)

--- pkgsrc/lang/openjdk8/distinfo 2022/05/24 21:32:43 1.88
+++ pkgsrc/lang/openjdk8/distinfo 2022/08/28 13:58:00 1.88.2.1
@@ -1,125 +1,121 @@ @@ -1,125 +1,121 @@
1$NetBSD: distinfo,v 1.88 2022/05/24 21:32:43 tnn Exp $ 1$NetBSD: distinfo,v 1.88.2.1 2022/08/28 13:58:00 spz Exp $
2 2
3BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 8745b980e290e509c0dd09706398b89afce85fee1405b9367b6684c83d56b96a 3BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 8745b980e290e509c0dd09706398b89afce85fee1405b9367b6684c83d56b96a
4SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4 4SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
5Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes 5Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
6BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = f425ea056cb5b06be950a38d3c6cc517e18a4fa6e9e9db010f380c63be6563a5 6BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = f425ea056cb5b06be950a38d3c6cc517e18a4fa6e9e9db010f380c63be6563a5
7SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 664d1f987af6b7271a5c6553a606beae09de3e77cea44ae8dd9327f78ac07afc9d81335ee342bd564617a3e54982d2ec75a827dcfc1ab4a2c54a041dd571f4fb 7SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 664d1f987af6b7271a5c6553a606beae09de3e77cea44ae8dd9327f78ac07afc9d81335ee342bd564617a3e54982d2ec75a827dcfc1ab4a2c54a041dd571f4fb
8Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 26955712 bytes 8Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 26955712 bytes
9BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = efc81291c3e2ee6810a6ace11a7e2f0688c2e9e714545240487d511b60ceb450 9BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = efc81291c3e2ee6810a6ace11a7e2f0688c2e9e714545240487d511b60ceb450
10SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 6514db6e244214169b85d37ea0a41655822a8db11922574e287802aef684cd753237521a5bffa6be1cd1e26e23c19851a5ea89fea54dbc935485903d524dd152 10SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 6514db6e244214169b85d37ea0a41655822a8db11922574e287802aef684cd753237521a5bffa6be1cd1e26e23c19851a5ea89fea54dbc935485903d524dd152
11Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 23104564 bytes 11Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 23104564 bytes
12BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = cd349b7c2dca11e42f1e427a8ed6a53820ffaa9df166053ebcf98aa09aa403e0 12BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = cd349b7c2dca11e42f1e427a8ed6a53820ffaa9df166053ebcf98aa09aa403e0
13SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 8c809f505435672f478036ddab436acdae032a2eed17698d36d74960fb17bde6f98b460c5904ac4737259e5e59d1a5447973a40085c633687d4b76ac3feda53c 13SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 8c809f505435672f478036ddab436acdae032a2eed17698d36d74960fb17bde6f98b460c5904ac4737259e5e59d1a5447973a40085c633687d4b76ac3feda53c
14Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes 14Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes
15BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = d24626a2251851aeb817021977f86b704cc07e5f3be7848e989d7dd35e520073 15BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = d24626a2251851aeb817021977f86b704cc07e5f3be7848e989d7dd35e520073
16SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 5391de2d35934b79462b603cd19c65b21712891d59afe9d6e5319ea479fe2bc528e4f423648cd6fc9bcaec97ed57b9e01d1c46d04bc4edb9ed5ae7131b7cd5d7 16SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 5391de2d35934b79462b603cd19c65b21712891d59afe9d6e5319ea479fe2bc528e4f423648cd6fc9bcaec97ed57b9e01d1c46d04bc4edb9ed5ae7131b7cd5d7
17Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes 17Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes
18BLAKE2s (openjdk7/bootstrap-jdk-1.8.181-netbsd-8-aarch64-20180917.tar.xz) = 36ddd58f37fc165d19ca2647b0b6ef7d32640ebee0fcd5674e0708cb806800fe 18BLAKE2s (openjdk7/bootstrap-jdk-1.8.181-netbsd-8-aarch64-20180917.tar.xz) = 36ddd58f37fc165d19ca2647b0b6ef7d32640ebee0fcd5674e0708cb806800fe
19SHA512 (openjdk7/bootstrap-jdk-1.8.181-netbsd-8-aarch64-20180917.tar.xz) = b1f302d33f8a8630c46fc20177a8a56dd521a51aec383e1111734130ea522d4da700554be9d82901930b497e9b73d1f714e3fb0232e4711aaaff9513a5c985cf 19SHA512 (openjdk7/bootstrap-jdk-1.8.181-netbsd-8-aarch64-20180917.tar.xz) = b1f302d33f8a8630c46fc20177a8a56dd521a51aec383e1111734130ea522d4da700554be9d82901930b497e9b73d1f714e3fb0232e4711aaaff9513a5c985cf
20Size (openjdk7/bootstrap-jdk-1.8.181-netbsd-8-aarch64-20180917.tar.xz) = 29542212 bytes 20Size (openjdk7/bootstrap-jdk-1.8.181-netbsd-8-aarch64-20180917.tar.xz) = 29542212 bytes
21BLAKE2s (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 7c16bafb772ca8a98ed300b751588d7c90dafe1d994822372971167993b44543 21BLAKE2s (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 7c16bafb772ca8a98ed300b751588d7c90dafe1d994822372971167993b44543
22SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 15ee0583de67df94c980eec197e5279344eaf94d4830e2030f8c8cbc795bce1e0abdf435be4be4c5da271a41d5441e9ebf4bd4f088b17698b5a1e4cc685ebf3a 22SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 15ee0583de67df94c980eec197e5279344eaf94d4830e2030f8c8cbc795bce1e0abdf435be4be4c5da271a41d5441e9ebf4bd4f088b17698b5a1e4cc685ebf3a
23Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes 23Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes
24BLAKE2s (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 98777d4ff1f864a9ff5a42870b30319abd39488be2abfdc5e7d3d59b016c5807 24BLAKE2s (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 98777d4ff1f864a9ff5a42870b30319abd39488be2abfdc5e7d3d59b016c5807
25SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f 25SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f
26Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes 26Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
27BLAKE2s (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = e0f2a86f4b2f07229023bd9f18046bd490ecd98752cec47a1dfba66369b2d269 27BLAKE2s (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = d6fab9676f8823b787cab9a818b4dfda9899e7a38f5d5c7cfeaafd172c64f05a
28SHA512 (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = 3614ef9ee4327242c62cdf80bee746c648a91e515e5611dcc8a2576fc6aaf073351132d910fcb16366302d59e615142ce9948be38eccbf236f250e9b15e6d752 28SHA512 (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = 8e3055a680d640879035246c1a0c612dd09f59f3b58d44c035c32fb7351e32d353c7b79a6cf784b432a533f98d462355da6456c6508175f7a15bb7297d138304
29Size (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = 88568471 bytes 29Size (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = 88770755 bytes
30SHA1 (patch-aa) = 8810cfed600ee3bf36a408cc77e497ac7b3e6838 30SHA1 (patch-aa) = 8810cfed600ee3bf36a408cc77e497ac7b3e6838
31SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c 31SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
32SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178 32SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
33SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5 33SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5
34SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa 34SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa
35SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557 35SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557
36SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800 36SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800
37SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63 37SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
38SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9 38SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9
39SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 39SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
40SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462 40SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462
41SHA1 (patch-common_autoconf_generated-configure.sh) = 6fb73788e7b1e98966f7005a10b7957745700ec9 41SHA1 (patch-common_autoconf_generated-configure.sh) = e28eec3e1e6de016d4f9356d781d925d3660547d
42SHA1 (patch-common_autoconf_spec.gmk.in) = 5fbf47f2241b5c898a75fb1741873043f1c983f0 42SHA1 (patch-common_autoconf_spec.gmk.in) = 5fbf47f2241b5c898a75fb1741873043f1c983f0
43SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6 43SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6
44SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928 44SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
45SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 2c0d286c87f8239e8d5aa7fcc21e09b4b1c5a46e 45SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 2c0d286c87f8239e8d5aa7fcc21e09b4b1c5a46e
46SHA1 (patch-hotspot_make_bsd_makefiles_saproc.make) = cf90f6a3d170aa7291fb3cfe4df7df20ec377132 46SHA1 (patch-hotspot_make_bsd_makefiles_saproc.make) = cf90f6a3d170aa7291fb3cfe4df7df20ec377132
47SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239 47SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
48SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d 48SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d
49SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 84e3d6b6603887aaac13747b5c972dd3eec4c7f1 49SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 84e3d6b6603887aaac13747b5c972dd3eec4c7f1
50SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976 50SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976
51SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = b846f0ef8e9ba2fb41e4d32b4cc07ea25170e022 51SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = b846f0ef8e9ba2fb41e4d32b4cc07ea25170e022
52SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = b2db4dbfd7cf3e862bf4604d722f5cf4e898c1bc 52SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = b2db4dbfd7cf3e862bf4604d722f5cf4e898c1bc
53SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 58965fe7c142b67be35cab8b30f84dcee2096e39 53SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 58965fe7c142b67be35cab8b30f84dcee2096e39
54SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 2dfd843c450971ee0857cbd81b946a4d7c86ee3b 54SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 2dfd843c450971ee0857cbd81b946a4d7c86ee3b
55SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 82ac550f4c342f657834f30f87b7b359e2b7b41b 55SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 82ac550f4c342f657834f30f87b7b359e2b7b41b
56SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850 56SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850
57SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = c41b360302bffd9fbfaa34ee7a4d5d1a756ae0e2 57SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = c41b360302bffd9fbfaa34ee7a4d5d1a756ae0e2
58SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 0ca85ba72d154643b934815a0a2deb1e77371ff9 58SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 0ca85ba72d154643b934815a0a2deb1e77371ff9
59SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = 787e0c68cf976fc0df3e19fb2a22b1b7e3662c07 59SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = 787e0c68cf976fc0df3e19fb2a22b1b7e3662c07
60SHA1 (patch-hotspot_src_cpu_aarch64_vm_vm__version__aarch64.cpp) = b02d08302974a923e19875c4fa30057580629f14 60SHA1 (patch-hotspot_src_cpu_aarch64_vm_vm__version__aarch64.cpp) = b02d08302974a923e19875c4fa30057580629f14
61SHA1 (patch-hotspot_src_cpu_aarch64_vm_vm__version__aarch64.hpp) = 6a766abe3c53ee3b15ad9636527d0e4b61942d4d 61SHA1 (patch-hotspot_src_cpu_aarch64_vm_vm__version__aarch64.hpp) = 6a766abe3c53ee3b15ad9636527d0e4b61942d4d
62SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088 62SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088
63SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = 446b96a91a2e4fa76f43ac653d1608f037c64af9 63SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = 446b96a91a2e4fa76f43ac653d1608f037c64af9
64SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_bytes__bsd__aarch64.inline.hpp) = acc0b870113ffc279d089da385e564f3ffd87f89 64SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_bytes__bsd__aarch64.inline.hpp) = acc0b870113ffc279d089da385e564f3ffd87f89
65SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp) = 10cab6ac79e57d6a36b9183ea62ff8b3965d68bb 65SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp) = 461717b25728884add18a8c68221ccea4ef81bbe
66SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_vm__version__bsd__aarch64.cpp) = d6762bb2a9fe6e158ccf23f7d04aa0cba588e78e 66SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_vm__version__bsd__aarch64.cpp) = d6762bb2a9fe6e158ccf23f7d04aa0cba588e78e
67SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = f46713855507654be42707b1f80a779796929069 67SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = f46713855507654be42707b1f80a779796929069
68SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6 68SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
69SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c 69SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
70SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 6a6b719a52408e88b27d3f2a5a41789dc15ef39d 70SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 6a6b719a52408e88b27d3f2a5a41789dc15ef39d
71SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp) = a0feebbe796ab6aeddb18cfaa829888f0e99dbd3 71SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.inline.hpp) = a0feebbe796ab6aeddb18cfaa829888f0e99dbd3
72SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 92377183e9b9f232dfd7161bf37a8856441f3977 72SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 92377183e9b9f232dfd7161bf37a8856441f3977
73SHA1 (patch-hotspot_src_os_bsd_vm_jsig.c) = 55f9f232f886ee57cd327639768c91c69d0c12c2 73SHA1 (patch-hotspot_src_os_bsd_vm_jsig.c) = 55f9f232f886ee57cd327639768c91c69d0c12c2
74SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = b56cfc0abb53f9ec79005d9169566aadeecc51e7 74SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = b56cfc0abb53f9ec79005d9169566aadeecc51e7
75SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = bb1d9b46b43b61e29e9bdf1e4311a486a81dc6f4 75SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = bb1d9b46b43b61e29e9bdf1e4311a486a81dc6f4
76SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = e4321382dc95fe9e363abc8c8a740e9f3f23c170 76SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = e4321382dc95fe9e363abc8c8a740e9f3f23c170
77SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 77SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
78SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = c8840633681c01d4a911e32e8d79060fbbdc506e 78SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = c8840633681c01d4a911e32e8d79060fbbdc506e
79SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 589bf0707023b9f799caf2cafe5aeba89af46b05 79SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 589bf0707023b9f799caf2cafe5aeba89af46b05
80SHA1 (patch-hotspot_src_share_vm_classfile_symbolTable.cpp) = c0077a7691ce2ba698f46d9fc8c81bf974aef68c 
81SHA1 (patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp) = b2bb8e74e43099fa9d1e157400bbb78386281235 
82SHA1 (patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp) = 9e9347f9695cce3599fe12448445bb20d9b36f08 
83SHA1 (patch-hotspot_src_share_vm_memory_metaspace.cpp) = 260005e002e0926447952850bbc1150e50a05509 
84SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329 80SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329
85SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 35484c16c7ff1ce57b78c1c0fafa0dfcc7f0072a 81SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 35484c16c7ff1ce57b78c1c0fafa0dfcc7f0072a
86SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293 82SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
87SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80 83SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80
88SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = f4ac9e8b00459a421412a11617b54f93c02d408b 84SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = f4ac9e8b00459a421412a11617b54f93c02d408b
89SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9 85SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
90SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7 86SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
91SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7 87SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
92SHA1 (patch-jdk_make_CompileLaunchers.gmk) = d496999f10fc56b1d68283ab4636787058f51090 88SHA1 (patch-jdk_make_CompileLaunchers.gmk) = d496999f10fc56b1d68283ab4636787058f51090
93SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 89SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
94SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 90SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
95SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41 91SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
96SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 1e29aaa4a4ce5bb104bdd8d8ba1b87f8ff09b8be 92SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 1e29aaa4a4ce5bb104bdd8d8ba1b87f8ff09b8be
97SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 21a46be1c8247d528a2e0666ca9a40520327771a 93SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 21a46be1c8247d528a2e0666ca9a40520327771a
98SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d 94SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
99SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = ab0ed14a661412aeb91ecde4251883817ea3cad4 95SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = ab0ed14a661412aeb91ecde4251883817ea3cad4
100SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393 96SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
101SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b 97SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b
102SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606 98SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
103SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317 99SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317
104SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50 100SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
105SHA1 (patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h) = bd2ef7ea0b2cd9ec8cb637e0c0d4dc3a25021773 101SHA1 (patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h) = bd2ef7ea0b2cd9ec8cb637e0c0d4dc3a25021773
106SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4 102SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4
107SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21 103SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21
108SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd 104SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd
109SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9 105SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9
110SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63 106SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63
111SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675 107SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675
112SHA1 (patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c) = 227457d22887347f718b7c28aa6b967378f55e81 108SHA1 (patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c) = 227457d22887347f718b7c28aa6b967378f55e81
113SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d 109SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
114SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209 110SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209
115SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 6d58169565503ef8e50224fce8380e42cb87baba 111SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 6d58169565503ef8e50224fce8380e42cb87baba
116SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124 112SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124
117SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f 113SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
118SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6 114SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6
119SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = 5fb2dd92820afcca5a04956d81e5244840b513f7 115SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = 5fb2dd92820afcca5a04956d81e5244840b513f7
120SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = e5d6121d2af74238347baa2d63670f0d520847f8 116SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = e5d6121d2af74238347baa2d63670f0d520847f8
121SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = bb0a20f688093f2d60f4a4937ae418fcebfcc7ca 117SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = bb0a20f688093f2d60f4a4937ae418fcebfcc7ca
122SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 07b071ace2a91acd1968ed670aead67d72f0d490 118SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 07b071ace2a91acd1968ed670aead67d72f0d490
123SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = c2db0716408ae1d081b3516b6c866b8f43cf5b6f 119SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = c2db0716408ae1d081b3516b6c866b8f43cf5b6f
124SHA1 (patch-langtools_make_build.xml) = e9dccdb67a0f25b266755f66e520c6420afaf7ba 120SHA1 (patch-langtools_make_build.xml) = e9dccdb67a0f25b266755f66e520c6420afaf7ba
125SHA1 (patch-make_common_NativeCompilation.gmk) = 8c1e0fd1e9eaa4be6db4b1622f199a063d923e20 121SHA1 (patch-make_common_NativeCompilation.gmk) = 8c1e0fd1e9eaa4be6db4b1622f199a063d923e20
cvs diff -r1.21 -r1.21.8.1 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh (switch to unified diff)

--- pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 2021/06/27 14:54:41 1.21
+++ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh 2022/08/28 13:58:00 1.21.8.1
@@ -1,399 +1,395 @@ @@ -1,399 +1,395 @@
1$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.21 2021/06/27 14:54:41 tnn Exp $ 1$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.21.8.1 2022/08/28 13:58:00 spz Exp $
2 2
3BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and 3--- common/autoconf/generated-configure.sh.orig 2022-05-26 16:48:39.258220648 +0000
4pkg/53223. 
5Fix detection of GCC>=10. 
6 
7--- common/autoconf/generated-configure.sh.orig 2021-05-14 21:52:06.000000000 +0000 
8+++ common/autoconf/generated-configure.sh 4+++ common/autoconf/generated-configure.sh
9@@ -4191,7 +4191,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi 5@@ -4198,7 +4198,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
10 # These toolchains are valid on different platforms 6 # These toolchains are valid on different platforms
11 VALID_TOOLCHAINS_bsd="clang gcc" 7 VALID_TOOLCHAINS_bsd="clang gcc"
12 VALID_TOOLCHAINS_linux="gcc clang" 8 VALID_TOOLCHAINS_linux="gcc clang"
13-VALID_TOOLCHAINS_solaris="solstudio" 9-VALID_TOOLCHAINS_solaris="solstudio"
14+VALID_TOOLCHAINS_solaris="gcc solstudio" 10+VALID_TOOLCHAINS_solaris="gcc solstudio"
15 VALID_TOOLCHAINS_macosx="gcc clang" 11 VALID_TOOLCHAINS_macosx="gcc clang"
16 VALID_TOOLCHAINS_aix="xlc" 12 VALID_TOOLCHAINS_aix="xlc"
17 VALID_TOOLCHAINS_windows="microsoft" 13 VALID_TOOLCHAINS_windows="microsoft"
18@@ -15482,9 +15482,6 @@ done 14@@ -15475,9 +15475,6 @@ done
19 # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. 15 # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
20 if test "x$MAKE" != x; then 16 if test "x$MAKE" != x; then
21 # User has supplied a make, test it. 17 # User has supplied a make, test it.
22- if test ! -f "$MAKE"; then 18- if test ! -f "$MAKE"; then
23- as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5 19- as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5
24- fi 20- fi
25  21
26 MAKE_CANDIDATE=""$MAKE"" 22 MAKE_CANDIDATE=""$MAKE""
27 DESCRIPTION="user supplied MAKE=$MAKE" 23 DESCRIPTION="user supplied MAKE=$MAKE"
28@@ -20173,7 +20170,7 @@ $as_echo "$as_me: Potential Boot JDK fou 24@@ -20352,7 +20349,7 @@ $as_echo "$as_me: Potential Boot JDK fou
29 BOOT_JDK_FOUND=no 25 BOOT_JDK_FOUND=no
30 else 26 else
31 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 27 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
32- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 28- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
33+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 29+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
34  30
35 # Extra M4 quote needed to protect [] in grep expression. 31 # Extra M4 quote needed to protect [] in grep expression.
36 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 32 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
37@@ -20505,7 +20502,7 @@ $as_echo "$as_me: Potential Boot JDK fou 33@@ -20684,7 +20681,7 @@ $as_echo "$as_me: Potential Boot JDK fou
38 BOOT_JDK_FOUND=no 34 BOOT_JDK_FOUND=no
39 else 35 else
40 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 36 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
41- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 37- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
42+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 38+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
43  39
44 # Extra M4 quote needed to protect [] in grep expression. 40 # Extra M4 quote needed to protect [] in grep expression.
45 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 41 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
46@@ -20823,7 +20820,7 @@ $as_echo "$as_me: Potential Boot JDK fou 42@@ -21002,7 +20999,7 @@ $as_echo "$as_me: Potential Boot JDK fou
47 BOOT_JDK_FOUND=no 43 BOOT_JDK_FOUND=no
48 else 44 else
49 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 45 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
50- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 46- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
51+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 47+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
52  48
53 # Extra M4 quote needed to protect [] in grep expression. 49 # Extra M4 quote needed to protect [] in grep expression.
54 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 50 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
55@@ -21011,7 +21008,7 @@ $as_echo "$as_me: Potential Boot JDK fou 51@@ -21190,7 +21187,7 @@ $as_echo "$as_me: Potential Boot JDK fou
56 BOOT_JDK_FOUND=no 52 BOOT_JDK_FOUND=no
57 else 53 else
58 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 54 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
59- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 55- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
60+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 56+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
61  57
62 # Extra M4 quote needed to protect [] in grep expression. 58 # Extra M4 quote needed to protect [] in grep expression.
63 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 59 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
64@@ -21289,7 +21286,7 @@ fi 60@@ -21468,7 +21465,7 @@ fi
65 # Resolve file symlinks 61 # Resolve file symlinks
66 while test $COUNTER -lt 20; do 62 while test $COUNTER -lt 20; do
67 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 63 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
68- if test "x$ISLINK" == x; then 64- if test "x$ISLINK" == x; then
69+ if test "x$ISLINK" = x; then 65+ if test "x$ISLINK" = x; then
70 # This is not a symbolic link! We are done! 66 # This is not a symbolic link! We are done!
71 break 67 break
72 fi 68 fi
73@@ -21339,7 +21336,7 @@ $as_echo "$as_me: Potential Boot JDK fou 69@@ -21518,7 +21515,7 @@ $as_echo "$as_me: Potential Boot JDK fou
74 BOOT_JDK_FOUND=no 70 BOOT_JDK_FOUND=no
75 else 71 else
76 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 72 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
77- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 73- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
78+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 74+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
79  75
80 # Extra M4 quote needed to protect [] in grep expression. 76 # Extra M4 quote needed to protect [] in grep expression.
81 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 77 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
82@@ -21554,7 +21551,7 @@ $as_echo "$as_me: Potential Boot JDK fou 78@@ -21733,7 +21730,7 @@ $as_echo "$as_me: Potential Boot JDK fou
83 BOOT_JDK_FOUND=no 79 BOOT_JDK_FOUND=no
84 else 80 else
85 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 81 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
86- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 82- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
87+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 83+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
88  84
89 # Extra M4 quote needed to protect [] in grep expression. 85 # Extra M4 quote needed to protect [] in grep expression.
90 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 86 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
91@@ -21734,7 +21731,7 @@ $as_echo "$as_me: Potential Boot JDK fou 87@@ -21913,7 +21910,7 @@ $as_echo "$as_me: Potential Boot JDK fou
92 BOOT_JDK_FOUND=no 88 BOOT_JDK_FOUND=no
93 else 89 else
94 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 90 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
95- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 91- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
96+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 92+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
97  93
98 # Extra M4 quote needed to protect [] in grep expression. 94 # Extra M4 quote needed to protect [] in grep expression.
99 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 95 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
100@@ -21942,7 +21939,7 @@ $as_echo "$as_me: Potential Boot JDK fou 96@@ -22121,7 +22118,7 @@ $as_echo "$as_me: Potential Boot JDK fou
101 BOOT_JDK_FOUND=no 97 BOOT_JDK_FOUND=no
102 else 98 else
103 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 99 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
104- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 100- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
105+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 101+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
106  102
107 # Extra M4 quote needed to protect [] in grep expression. 103 # Extra M4 quote needed to protect [] in grep expression.
108 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 104 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
109@@ -22122,7 +22119,7 @@ $as_echo "$as_me: Potential Boot JDK fou 105@@ -22301,7 +22298,7 @@ $as_echo "$as_me: Potential Boot JDK fou
110 BOOT_JDK_FOUND=no 106 BOOT_JDK_FOUND=no
111 else 107 else
112 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 108 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
113- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 109- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
114+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 110+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
115  111
116 # Extra M4 quote needed to protect [] in grep expression. 112 # Extra M4 quote needed to protect [] in grep expression.
117 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 113 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
118@@ -22330,7 +22327,7 @@ $as_echo "$as_me: Potential Boot JDK fou 114@@ -22509,7 +22506,7 @@ $as_echo "$as_me: Potential Boot JDK fou
119 BOOT_JDK_FOUND=no 115 BOOT_JDK_FOUND=no
120 else 116 else
121 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 117 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
122- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 118- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
123+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 119+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
124  120
125 # Extra M4 quote needed to protect [] in grep expression. 121 # Extra M4 quote needed to protect [] in grep expression.
126 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 122 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
127@@ -22510,7 +22507,7 @@ $as_echo "$as_me: Potential Boot JDK fou 123@@ -22689,7 +22686,7 @@ $as_echo "$as_me: Potential Boot JDK fou
128 BOOT_JDK_FOUND=no 124 BOOT_JDK_FOUND=no
129 else 125 else
130 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 126 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
131- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 127- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
132+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 128+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
133  129
134 # Extra M4 quote needed to protect [] in grep expression. 130 # Extra M4 quote needed to protect [] in grep expression.
135 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 131 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
136@@ -22718,7 +22715,7 @@ $as_echo "$as_me: Potential Boot JDK fou 132@@ -22897,7 +22894,7 @@ $as_echo "$as_me: Potential Boot JDK fou
137 BOOT_JDK_FOUND=no 133 BOOT_JDK_FOUND=no
138 else 134 else
139 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 135 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
140- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 136- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
141+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 137+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
142  138
143 # Extra M4 quote needed to protect [] in grep expression. 139 # Extra M4 quote needed to protect [] in grep expression.
144 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 140 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
145@@ -22898,7 +22895,7 @@ $as_echo "$as_me: Potential Boot JDK fou 141@@ -23077,7 +23074,7 @@ $as_echo "$as_me: Potential Boot JDK fou
146 BOOT_JDK_FOUND=no 142 BOOT_JDK_FOUND=no
147 else 143 else
148 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 144 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
149- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 145- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
150+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 146+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
151  147
152 # Extra M4 quote needed to protect [] in grep expression. 148 # Extra M4 quote needed to protect [] in grep expression.
153 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 149 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
154@@ -23093,7 +23090,7 @@ $as_echo "$as_me: Potential Boot JDK fou 150@@ -23272,7 +23269,7 @@ $as_echo "$as_me: Potential Boot JDK fou
155 BOOT_JDK_FOUND=no 151 BOOT_JDK_FOUND=no
156 else 152 else
157 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 153 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
158- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 154- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
159+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 155+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
160  156
161 # Extra M4 quote needed to protect [] in grep expression. 157 # Extra M4 quote needed to protect [] in grep expression.
162 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 158 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
163@@ -23271,7 +23268,7 @@ $as_echo "$as_me: Potential Boot JDK fou 159@@ -23450,7 +23447,7 @@ $as_echo "$as_me: Potential Boot JDK fou
164 BOOT_JDK_FOUND=no 160 BOOT_JDK_FOUND=no
165 else 161 else
166 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 162 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
167- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 163- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
168+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 164+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
169  165
170 # Extra M4 quote needed to protect [] in grep expression. 166 # Extra M4 quote needed to protect [] in grep expression.
171 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 167 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
172@@ -23467,7 +23464,7 @@ $as_echo "$as_me: Potential Boot JDK fou 168@@ -23646,7 +23643,7 @@ $as_echo "$as_me: Potential Boot JDK fou
173 BOOT_JDK_FOUND=no 169 BOOT_JDK_FOUND=no
174 else 170 else
175 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 171 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
176- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 172- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
177+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 173+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
178  174
179 # Extra M4 quote needed to protect [] in grep expression. 175 # Extra M4 quote needed to protect [] in grep expression.
180 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 176 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
181@@ -23645,7 +23642,7 @@ $as_echo "$as_me: Potential Boot JDK fou 177@@ -23824,7 +23821,7 @@ $as_echo "$as_me: Potential Boot JDK fou
182 BOOT_JDK_FOUND=no 178 BOOT_JDK_FOUND=no
183 else 179 else
184 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 180 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
185- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 181- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
186+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 182+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
187  183
188 # Extra M4 quote needed to protect [] in grep expression. 184 # Extra M4 quote needed to protect [] in grep expression.
189 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 185 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
190@@ -23840,7 +23837,7 @@ $as_echo "$as_me: Potential Boot JDK fou 186@@ -24019,7 +24016,7 @@ $as_echo "$as_me: Potential Boot JDK fou
191 BOOT_JDK_FOUND=no 187 BOOT_JDK_FOUND=no
192 else 188 else
193 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 189 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
194- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 190- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
195+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 191+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
196  192
197 # Extra M4 quote needed to protect [] in grep expression. 193 # Extra M4 quote needed to protect [] in grep expression.
198 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 194 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
199@@ -24018,7 +24015,7 @@ $as_echo "$as_me: Potential Boot JDK fou 195@@ -24197,7 +24194,7 @@ $as_echo "$as_me: Potential Boot JDK fou
200 BOOT_JDK_FOUND=no 196 BOOT_JDK_FOUND=no
201 else 197 else
202 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 198 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
203- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 199- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
204+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 200+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
205  201
206 # Extra M4 quote needed to protect [] in grep expression. 202 # Extra M4 quote needed to protect [] in grep expression.
207 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 203 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
208@@ -24214,7 +24211,7 @@ $as_echo "$as_me: Potential Boot JDK fou 204@@ -24393,7 +24390,7 @@ $as_echo "$as_me: Potential Boot JDK fou
209 BOOT_JDK_FOUND=no 205 BOOT_JDK_FOUND=no
210 else 206 else
211 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 207 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
212- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 208- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
213+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 209+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
214  210
215 # Extra M4 quote needed to protect [] in grep expression. 211 # Extra M4 quote needed to protect [] in grep expression.
216 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 212 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
217@@ -24392,7 +24389,7 @@ $as_echo "$as_me: Potential Boot JDK fou 213@@ -24571,7 +24568,7 @@ $as_echo "$as_me: Potential Boot JDK fou
218 BOOT_JDK_FOUND=no 214 BOOT_JDK_FOUND=no
219 else 215 else
220 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 216 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
221- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 217- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
222+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 218+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
223  219
224 # Extra M4 quote needed to protect [] in grep expression. 220 # Extra M4 quote needed to protect [] in grep expression.
225 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 221 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
226@@ -24569,7 +24566,7 @@ $as_echo "$as_me: Potential Boot JDK fou 222@@ -24748,7 +24745,7 @@ $as_echo "$as_me: Potential Boot JDK fou
227 BOOT_JDK_FOUND=no 223 BOOT_JDK_FOUND=no
228 else 224 else
229 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? 225 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
230- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` 226- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
231+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` 227+ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
232  228
233 # Extra M4 quote needed to protect [] in grep expression. 229 # Extra M4 quote needed to protect [] in grep expression.
234 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` 230 FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
235@@ -24975,16 +24972,15 @@ $as_echo_n "checking flags for boot jdk  231@@ -25154,16 +25151,15 @@ $as_echo_n "checking flags for boot jdk
236 # Maximum amount of heap memory. 232 # Maximum amount of heap memory.
237 # Maximum stack size. 233 # Maximum stack size.
238 if test "x$BOOT_JDK_BITS" = x32; then 234 if test "x$BOOT_JDK_BITS" = x32; then
239- JVM_MAX_HEAP=768M 235- JVM_MAX_HEAP=768M
240 STACK_SIZE=768 236 STACK_SIZE=768
241 else 237 else
242 # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit 238 # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
243 # pointers are used. Apparently, we need to increase the heap and stack 239 # pointers are used. Apparently, we need to increase the heap and stack
244 # space for the jvm. More specifically, when running javac to build huge 240 # space for the jvm. More specifically, when running javac to build huge
245 # jdk batch 241 # jdk batch
246- JVM_MAX_HEAP=1600M 242- JVM_MAX_HEAP=1600M
247 STACK_SIZE=1536 243 STACK_SIZE=1536
248 fi 244 fi
249+ JVM_MAX_HEAP=800M 245+ JVM_MAX_HEAP=800M
250  246
251 $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5 247 $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
252 $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5 248 $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
253@@ -27518,7 +27514,7 @@ $as_echo_n "checking resolved symbolic l 249@@ -27719,7 +27715,7 @@ $as_echo_n "checking resolved symbolic l
254 # Resolve file symlinks 250 # Resolve file symlinks
255 while test $COUNTER -lt 20; do 251 while test $COUNTER -lt 20; do
256 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 252 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
257- if test "x$ISLINK" == x; then 253- if test "x$ISLINK" == x; then
258+ if test "x$ISLINK" = x; then 254+ if test "x$ISLINK" = x; then
259 # This is not a symbolic link! We are done! 255 # This is not a symbolic link! We are done!
260 break 256 break
261 fi 257 fi
262@@ -27973,7 +27969,7 @@ $as_echo_n "checking for resolved symbol 258@@ -28174,7 +28170,7 @@ $as_echo_n "checking for resolved symbol
263 # Resolve file symlinks 259 # Resolve file symlinks
264 while test $COUNTER -lt 20; do 260 while test $COUNTER -lt 20; do
265 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 261 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
266- if test "x$ISLINK" == x; then 262- if test "x$ISLINK" == x; then
267+ if test "x$ISLINK" = x; then 263+ if test "x$ISLINK" = x; then
268 # This is not a symbolic link! We are done! 264 # This is not a symbolic link! We are done!
269 break 265 break
270 fi 266 fi
271@@ -29259,7 +29255,7 @@ $as_echo_n "checking resolved symbolic l 267@@ -29460,7 +29456,7 @@ $as_echo_n "checking resolved symbolic l
272 # Resolve file symlinks 268 # Resolve file symlinks
273 while test $COUNTER -lt 20; do 269 while test $COUNTER -lt 20; do
274 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 270 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
275- if test "x$ISLINK" == x; then 271- if test "x$ISLINK" == x; then
276+ if test "x$ISLINK" = x; then 272+ if test "x$ISLINK" = x; then
277 # This is not a symbolic link! We are done! 273 # This is not a symbolic link! We are done!
278 break 274 break
279 fi 275 fi
280@@ -29714,7 +29710,7 @@ $as_echo_n "checking for resolved symbol 276@@ -29915,7 +29911,7 @@ $as_echo_n "checking for resolved symbol
281 # Resolve file symlinks 277 # Resolve file symlinks
282 while test $COUNTER -lt 20; do 278 while test $COUNTER -lt 20; do
283 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 279 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
284- if test "x$ISLINK" == x; then 280- if test "x$ISLINK" == x; then
285+ if test "x$ISLINK" = x; then 281+ if test "x$ISLINK" = x; then
286 # This is not a symbolic link! We are done! 282 # This is not a symbolic link! We are done!
287 break 283 break
288 fi 284 fi
289@@ -41431,6 +41427,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } 285@@ -42022,6 +42018,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
290 SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" 286 SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
291 SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' 287 SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
292 SET_SHARED_LIBRARY_MAPFILE='' 288 SET_SHARED_LIBRARY_MAPFILE=''
293+ elif test "x$OPENJDK_TARGET_OS" = xsolaris; then 289+ elif test "x$OPENJDK_TARGET_OS" = xsolaris; then
294+ SHARED_LIBRARY_FLAGS="-shared" 290+ SHARED_LIBRARY_FLAGS="-shared"
295+ SET_EXECUTABLE_ORIGIN='-R\$$$$ORIGIN$1' 291+ SET_EXECUTABLE_ORIGIN='-R\$$$$ORIGIN$1'
296+ SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" 292+ SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
297+ SET_SHARED_LIBRARY_NAME='' 293+ SET_SHARED_LIBRARY_NAME=''
298+ SET_SHARED_LIBRARY_MAPFILE='' 294+ SET_SHARED_LIBRARY_MAPFILE=''
299 else 295 else
300 # Default works for linux, might work on other platforms as well. 296 # Default works for linux, might work on other platforms as well.
301 SHARED_LIBRARY_FLAGS='-shared' 297 SHARED_LIBRARY_FLAGS='-shared'
302@@ -41482,7 +41484,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; } 298@@ -42093,7 +42095,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
303 if test "x$OPENJDK_TARGET_OS" = xsolaris; then 299 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
304 CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__" 300 CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
305 CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__" 301 CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
306+ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then 302+ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
307 CFLAGS_JDKLIB_EXTRA='-xstrconst' 303 CFLAGS_JDKLIB_EXTRA='-xstrconst'
308+ fi 304+ fi
309 fi 305 fi
310 # The (cross) compiler is now configured, we can now test capabilities 306 # The (cross) compiler is now configured, we can now test capabilities
311 # of the target platform. 307 # of the target platform.
312@@ -41623,7 +41627,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; } 308@@ -42253,7 +42257,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
313 elif test "x$TOOLCHAIN_TYPE" = xgcc; then 309 elif test "x$TOOLCHAIN_TYPE" = xgcc; then
314 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" 310 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
315 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" 311 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
316- if test "x$OPENJDK_TARGET_OS" != xmacosx; then 312- if test "x$OPENJDK_TARGET_OS" != xmacosx; then
317+ if test "x$OPENJDK_TARGET_OS" != xmacosx -a test "x$OPENJDK_TARGET_OS" != xsolaris; then 313+ if test "x$OPENJDK_TARGET_OS" != xmacosx -a test "x$OPENJDK_TARGET_OS" != xsolaris; then
318 LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" 314 LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
319 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" 315 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
320 fi 316 fi
321@@ -42370,7 +42374,9 @@ $as_echo "$supports" >&6; } 317@@ -43112,7 +43116,9 @@ $as_echo "$supports" >&6; }
322 # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous 318 # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
323 # java heap. 319 # java heap.
324 if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then 320 if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
325+ if test "x$OPENJDK_TARGET_OS" != "xsolaris"; then 321+ if test "x$OPENJDK_TARGET_OS" != "xsolaris"; then
326 LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie" 322 LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie"
327+ fi 323+ fi
328 fi 324 fi
329 fi 325 fi
330 fi 326 fi
331@@ -42863,7 +42869,8 @@ $as_echo "alsa pulse x11" >&6; } 327@@ -43600,7 +43606,8 @@ $as_echo "alsa pulse x11" >&6; }
332 if test "x$OPENJDK_TARGET_OS" = xbsd; then 328 if test "x$OPENJDK_TARGET_OS" = xbsd; then
333 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5 329 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
334 $as_echo_n "checking what is not needed on BSD?... " >&6; } 330 $as_echo_n "checking what is not needed on BSD?... " >&6; }
335- if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then 331- if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then
336+ if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xnetbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xfreebsd; then 332+ if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xnetbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xfreebsd; then
337+# XXX revisit this 333+# XXX revisit this
338 ALSA_NOT_NEEDED=yes 334 ALSA_NOT_NEEDED=yes
339 PULSE_NOT_NEEDED=yes 335 PULSE_NOT_NEEDED=yes
340 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 336 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
341@@ -44093,7 +44100,7 @@ $as_echo "$as_me: WARNING: Can't find pr 337@@ -44830,7 +44837,7 @@ $as_echo "$as_me: WARNING: Can't find pr
342 BUILD_FREETYPE=no 338 BUILD_FREETYPE=no
343 fi 339 fi
344 # Now check if configure found a version of 'msbuild.exe' 340 # Now check if configure found a version of 'msbuild.exe'
345- if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" == x ; then 341- if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" == x ; then
346+ if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" = x ; then 342+ if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" = x ; then
347 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5 343 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5
348 $as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;} 344 $as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;}
349 BUILD_FREETYPE=no 345 BUILD_FREETYPE=no
350@@ -44509,7 +44516,11 @@ $as_echo "$as_me: WARNING: --with-freety 346@@ -45246,7 +45253,11 @@ $as_echo "$as_me: WARNING: --with-freety
351  347
352 # Allow --with-freetype-lib and --with-freetype-include to override 348 # Allow --with-freetype-lib and --with-freetype-include to override
353 if test "x$with_freetype_include" != x; then 349 if test "x$with_freetype_include" != x; then
354- POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" 350- POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
355+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" 351+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
356+ # deal w/ freetype2 in new location 352+ # deal w/ freetype2 in new location
357+ if test -f "$with_freetype_include"/freetype2/ft2build.h; then 353+ if test -f "$with_freetype_include"/freetype2/ft2build.h; then
358+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"/freetype2 354+ POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"/freetype2
359+ fi 355+ fi
360 fi 356 fi
361 if test "x$with_freetype_lib" != x; then 357 if test "x$with_freetype_lib" != x; then
362 POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib" 358 POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
363@@ -47619,7 +47630,7 @@ $as_echo "$as_me: The path of FREETYPE_I 359@@ -48356,7 +48367,7 @@ $as_echo "$as_me: The path of FREETYPE_I
364 FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`" 360 FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
365 fi 361 fi
366  362
367- if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then 363- if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
368+ if test -d $FREETYPE_INCLUDE_PATH/freetype2; then 364+ if test -d $FREETYPE_INCLUDE_PATH/freetype2; then
369 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH" 365 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
370 else 366 else
371 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH" 367 FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
372@@ -47752,7 +47763,7 @@ $as_echo "$as_me: The path of FREETYPE_L 368@@ -48489,7 +48500,7 @@ $as_echo "$as_me: The path of FREETYPE_L
373 if test "x$OPENJDK_TARGET_OS" = xwindows; then 369 if test "x$OPENJDK_TARGET_OS" = xwindows; then
374 FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib" 370 FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
375 else 371 else
376- FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype" 372- FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype"
377+ FREETYPE_LIBS="-Xlinker -R$FREETYPE_LIB_PATH -L$FREETYPE_LIB_PATH -lfreetype" 373+ FREETYPE_LIBS="-Xlinker -R$FREETYPE_LIB_PATH -L$FREETYPE_LIB_PATH -lfreetype"
378 fi 374 fi
379 fi 375 fi
380  376
381@@ -49089,9 +49100,6 @@ fi 377@@ -49824,9 +49835,6 @@ fi
382  378
383  379
384  380
385- if test "x$LLVM_CONFIG" != xllvm-config; then 381- if test "x$LLVM_CONFIG" != xllvm-config; then
386- as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5 382- as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5
387- fi 383- fi
388  384
389 llvm_components="jit mcjit engine nativecodegen native" 385 llvm_components="jit mcjit engine nativecodegen native"
390 unset LLVM_CFLAGS 386 unset LLVM_CFLAGS
391@@ -49134,7 +49142,7 @@ fi 387@@ -49869,7 +49877,7 @@ fi
392 fi 388 fi
393  389
394 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so) 390 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
395- if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then 391- if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then
396+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x && test "x$GCC" = "xno"; then 392+ if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x && test "x$GCC" = "xno"; then
397 LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1" 393 LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
398 fi 394 fi
399  395
cvs diff -r1.1 -r1.1.8.1 pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp (switch to unified diff)

--- pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp 2021/06/27 18:30:26 1.1
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp 2022/08/28 13:58:00 1.1.8.1
@@ -1,51 +1,51 @@ @@ -1,51 +1,51 @@
1$NetBSD: patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp,v 1.1 2021/06/27 18:30:26 tnn Exp $ 1$NetBSD: patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp,v 1.1.8.1 2022/08/28 13:58:00 spz Exp $
2 2
3NetBSD/evbarm-aarch64 support 3NetBSD/evbarm-aarch64 support
4 4
5--- hotspot/src/os_cpu/bsd_aarch64/vm/os_bsd_aarch64.cpp.orig 2021-05-14 21:52:06.000000000 +0000 5--- hotspot/src/os_cpu/bsd_aarch64/vm/os_bsd_aarch64.cpp.orig 2022-04-23 02:23:55.000000000 +0000
6+++ hotspot/src/os_cpu/bsd_aarch64/vm/os_bsd_aarch64.cpp 6+++ hotspot/src/os_cpu/bsd_aarch64/vm/os_bsd_aarch64.cpp
7@@ -107,6 +107,8 @@ address os::Bsd::ucontext_get_pc(ucontex 7@@ -110,6 +110,8 @@ address os::Bsd::ucontext_get_pc(ucontex
8 return (address)uc->uc_mcontext.mc_gpregs.gp_elr; 8 return (address)uc->uc_mcontext.mc_gpregs.gp_elr;
9 #elif defined(__OpenBSD__) 9 #elif defined(__OpenBSD__)
10 return (address)uc->sc_elr; 10 return (address)uc->sc_elr;
11+#elif defined(__NetBSD__) 11+#elif defined(__NetBSD__)
12+ return (address)uc->uc_mcontext.__gregs[_REG_ELR]; 12+ return (address)uc->uc_mcontext.__gregs[_REG_ELR];
13 #endif 13 #endif
14 } 14 }
15  15
16@@ -115,6 +117,8 @@ void os::Bsd::ucontext_set_pc(ucontext_t 16@@ -118,6 +120,8 @@ void os::Bsd::ucontext_set_pc(ucontext_t
17 uc->uc_mcontext.mc_gpregs.gp_elr = (intptr_t)pc; 17 uc->uc_mcontext.mc_gpregs.gp_elr = (intptr_t)pc;
18 #elif defined(__OpenBSD__) 18 #elif defined(__OpenBSD__)
19 uc->sc_elr = (unsigned long)pc; 19 uc->sc_elr = (unsigned long)pc;
20+#elif defined(__NetBSD__) 20+#elif defined(__NetBSD__)
21+ uc->uc_mcontext.__gregs[_REG_ELR] = (__greg_t)pc; 21+ uc->uc_mcontext.__gregs[_REG_ELR] = (__greg_t)pc;
22 #endif 22 #endif
23 } 23 }
24  24
25@@ -123,6 +127,8 @@ intptr_t* os::Bsd::ucontext_get_sp(ucont 25@@ -126,6 +130,8 @@ intptr_t* os::Bsd::ucontext_get_sp(ucont
26 return (intptr_t*)uc->uc_mcontext.mc_gpregs.gp_sp; 26 return (intptr_t*)uc->uc_mcontext.mc_gpregs.gp_sp;
27 #elif defined(__OpenBSD__) 27 #elif defined(__OpenBSD__)
28 return (intptr_t*)uc->sc_sp; 28 return (intptr_t*)uc->sc_sp;
29+#elif defined(__NetBSD__) 29+#elif defined(__NetBSD__)
30+ return (intptr_t*)uc->uc_mcontext.__gregs[_REG_SP]; 30+ return (intptr_t*)uc->uc_mcontext.__gregs[_REG_SP];
31 #endif 31 #endif
32 } 32 }
33  33
34@@ -131,6 +137,8 @@ intptr_t* os::Bsd::ucontext_get_fp(ucont 34@@ -134,6 +140,8 @@ intptr_t* os::Bsd::ucontext_get_fp(ucont
35 return (intptr_t*)uc->uc_mcontext.mc_gpregs.gp_x[REG_FP]; 35 return (intptr_t*)uc->uc_mcontext.mc_gpregs.gp_x[REG_FP];
36 #elif defined(__OpenBSD__) 36 #elif defined(__OpenBSD__)
37 return (intptr_t*)uc->sc_x[REG_FP]; 37 return (intptr_t*)uc->sc_x[REG_FP];
38+#elif defined(__NetBSD__) 38+#elif defined(__NetBSD__)
39+ return (intptr_t*)uc->uc_mcontext.__gregs[_REG_FP]; 39+ return (intptr_t*)uc->uc_mcontext.__gregs[_REG_FP];
40 #endif 40 #endif
41 } 41 }
42  42
43@@ -285,7 +293,7 @@ JVM_handle_bsd_signal(int sig, 43@@ -288,7 +296,7 @@ JVM_handle_bsd_signal(int sig,
44 return 1; 44 return 1;
45 } 45 }
46  46
47-#ifndef AMD64 47-#if !defined(AMD64) && !defined(__OpenBSD__)
48+#if 0 48+#if !defined(AMD64) && defined(SI_KERNEL)
49 // Halt if SI_KERNEL before more crashes get misdiagnosed as Java bugs 49 // Halt if SI_KERNEL before more crashes get misdiagnosed as Java bugs
50 // This can happen in any running code (currently more frequently in 50 // This can happen in any running code (currently more frequently in
51 // interpreter code but has been seen in compiled code) 51 // interpreter code but has been seen in compiled code)
File Deleted: pkgsrc/lang/openjdk8/patches/Attic/patch-hotspot_src_share_vm_classfile_symbolTable.cpp
File Deleted: pkgsrc/lang/openjdk8/patches/Attic/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
File Deleted: pkgsrc/lang/openjdk8/patches/Attic/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
File Deleted: pkgsrc/lang/openjdk8/patches/Attic/patch-hotspot_src_share_vm_memory_metaspace.cpp