Mercurial > hg > icedtea8-forest

changeset 2734:e6a93407c0f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8u292-b05
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Sun, 25 Apr 2021 18:18:45 +0100
parents 13f68604788c (current diff) 8006ef1eeba6 (diff)
children bce8f651ffc3
files .hgtags common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4
diffstat 4 files changed, 32 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Feb 05 20:19:33 2021 +0000
+++ b/.hgtags	Sun Apr 25 18:18:45 2021 +0100
@@ -1114,3 +1114,9 @@
 8ebc0b4f90a24aa7c7d317054b2511bdb7fb7c4c jdk8u282-b08
 8ebc0b4f90a24aa7c7d317054b2511bdb7fb7c4c jdk8u282-ga
 b8690148b02e927eed667f687dcaedacc66a69c8 icedtea-3.18.0
+61aef7018a0dbc29ce4701e4d29d2dbb2d12ff65 jdk8u292-b00
+b785e6a31314cfa8ccb07168320f9f363b4850a2 jdk8u292-b01
+bb7a8007add7c59f9bee52a5de99d6f93e6c2bba jdk8u292-b02
+cb5f9e3b91262279744db78a9ae8fa8a2d43594f jdk8u292-b03
+54c2268dd734b8a5b70f817708742eef43ec7e21 jdk8u292-b04
+120809c21ad7f2ba826948edc8b392ce2d6403da jdk8u292-b05
--- a/THIRD_PARTY_README	Fri Feb 05 20:19:33 2021 +0000
+++ b/THIRD_PARTY_README	Sun Apr 25 18:18:45 2021 +0100
@@ -154,8 +154,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to CUP Parser Generator for 
-Java 0.10b, which may be included with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to CUP Parser Generator for
+Java 0.11b, which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
--- a/common/autoconf/generated-configure.sh	Fri Feb 05 20:19:33 2021 +0000
+++ b/common/autoconf/generated-configure.sh	Sun Apr 25 18:18:45 2021 +0100
@@ -1036,7 +1036,6 @@
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1301,7 +1300,6 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1554,15 +1552,6 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1700,7 +1689,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1853,7 +1842,6 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -4474,7 +4462,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1592500545
+DATE_WHEN_GENERATED=1619365667
 
 ###############################################################################
 #
@@ -53107,9 +53095,18 @@
       fi
       UCRT_DLL_DIR="$CYGWIN_WINDOWSSDKDIR/Redist/ucrt/DLLs/$dll_subdir"
       if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-        as_fn_error $? "Could not find any dlls in $UCRT_DLL_DIR" "$LINENO" 5
+        # Try with version subdir
+        UCRT_DLL_DIR="`ls -d $CYGWIN_WINDOWSSDKDIR/Redist/*/ucrt/DLLs/$dll_subdir \
+            2> /dev/null | $SORT -d | $HEAD -n1`"
+        if test -z "$UCRT_DLL_DIR" \
+            || test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          as_fn_error $? "Could not find any dlls in $UCRT_DLL_DIR" "$LINENO" 5
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UCRT_DLL_DIR" >&5
+$as_echo "$UCRT_DLL_DIR" >&6; }
+        fi
       else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UCRT_DLL_DIR" >&5
 $as_echo "$UCRT_DLL_DIR" >&6; }
--- a/common/autoconf/toolchain_windows.m4	Fri Feb 05 20:19:33 2021 +0000
+++ b/common/autoconf/toolchain_windows.m4	Sun Apr 25 18:18:45 2021 +0100
@@ -672,8 +672,16 @@
       fi
       UCRT_DLL_DIR="$CYGWIN_WINDOWSSDKDIR/Redist/ucrt/DLLs/$dll_subdir"
       if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([Could not find any dlls in $UCRT_DLL_DIR])
+        # Try with version subdir
+        UCRT_DLL_DIR="`ls -d $CYGWIN_WINDOWSSDKDIR/Redist/*/ucrt/DLLs/$dll_subdir \
+            2> /dev/null | $SORT -d | $HEAD -n1`"
+        if test -z "$UCRT_DLL_DIR" \
+            || test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
+          AC_MSG_RESULT([no])
+          AC_MSG_ERROR([Could not find any dlls in $UCRT_DLL_DIR])
+        else
+          AC_MSG_RESULT($UCRT_DLL_DIR)
+        fi
       else
         AC_MSG_RESULT($UCRT_DLL_DIR)
       fi