From 4798dd0907289a5263e5a471b2c2d875c092cb99 Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Fri, 9 Dec 2022 17:36:57 +0000
Subject: [PATCH 1/2] 8258005: JDK build fails with incorrect fixpath script

Reviewed-by: phh
Backport-of: 07399029d7fc80a5104791c4abbb2d36be7e620c
---
 make/autoconf/basic_windows.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/autoconf/basic_windows.m4 b/make/autoconf/basic_windows.m4
index c85aab19b04..dc19b631cc6 100644
--- a/make/autoconf/basic_windows.m4
+++ b/make/autoconf/basic_windows.m4
@@ -121,7 +121,7 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
   else
     WINENV_PREFIX_ARG="$WINENV_PREFIX"
   fi
-  FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT/\\/\\\\}  -t $WINENV_TEMP_DIR -c $CMD -q"
+  FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR -c $CMD -q"
   FIXPATH_BASE="$BASH $FIXPATH_DIR/fixpath.sh $FIXPATH_ARGS"
   FIXPATH="$FIXPATH_BASE exec"
 
@@ -166,7 +166,7 @@ AC_DEFUN([BASIC_WINDOWS_FINALIZE_FIXPATH],
 [
   if test "x$OPENJDK_BUILD_OS" = xwindows; then
     FIXPATH_CMDLINE=". $TOPDIR/make/scripts/fixpath.sh -e $PATHTOOL \
-        -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT/\\/\\\\}  -t $WINENV_TEMP_DIR \
+        -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR \
         -c $CMD -q"
     $ECHO >  $OUTPUTDIR/fixpath '#!/bin/bash'
     $ECHO >> $OUTPUTDIR/fixpath export PATH='"[$]PATH:'$PATH'"'

From b7140b2e52c75a88e256f8d2f1fe5acc4b78b47f Mon Sep 17 00:00:00 2001
From: J9 Build <j9build@ca.ibm.com>
Date: Thu, 15 Dec 2022 04:04:38 +0000
Subject: [PATCH 2/2] Update OPENJDK_TAG to merged level jdk-11.0.18+7

Signed-off-by: J9 Build <j9build@ca.ibm.com>
---
 closed/openjdk-tag.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/closed/openjdk-tag.gmk b/closed/openjdk-tag.gmk
index cb3fc8ff31e..df6cbb1bff9 100644
--- a/closed/openjdk-tag.gmk
+++ b/closed/openjdk-tag.gmk
@@ -1 +1 @@
-OPENJDK_TAG := jdk-11.0.18+6
+OPENJDK_TAG := jdk-11.0.18+7