From 83373d69c86b5fc795bb84f7ef750541132552b6 Mon Sep 17 00:00:00 2001
From: Mathias-Boulay <mathiasboulay@free.fr>
Date: Sat, 23 Nov 2024 20:52:47 +0100
Subject: [PATCH] Fix: update patches for master jre21

---
 5_clonejdk.sh                              | 2 +-
 Dockerfile                                 | 9 +++++++--
 patches/jre_21/android/jdk21u_android.diff | 9 ++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/5_clonejdk.sh b/5_clonejdk.sh
index 203a3129..c5cd9edf 100755
--- a/5_clonejdk.sh
+++ b/5_clonejdk.sh
@@ -2,7 +2,7 @@
 set -e
 
 if [[ $TARGET_VERSION -eq 21 ]]; then
-    git clone --branch jdk21.0.1 --depth 1 https://github.com/openjdk/jdk21u openjdk-21
+    git clone --depth 1 https://github.com/openjdk/jdk21u openjdk-21
 else
     git clone --depth 1 https://github.com/openjdk/jdk17u openjdk-17
 fi
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a8ad971a..47578a36 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,14 @@
-FROM ubuntu:23.10
+FROM ubuntu:22.04
 
 RUN apt-get update
 
+
+
 # Install dependencies
+RUN apt-get install -y wget
+
+# Cmake repositories to have an up to date version
+RUN wget -qO - https://apt.kitware.com/kitware-archive.sh | bash 
 
 # Raw tools
 RUN apt-get install -y \
@@ -23,7 +29,6 @@ RUN apt-get install -y \
     libxrender-dev \
     libxtst-dev \
     libxt-dev \
-    wget \
     gcc \
     g++ \
     clang \
diff --git a/patches/jre_21/android/jdk21u_android.diff b/patches/jre_21/android/jdk21u_android.diff
index 5eeac6b7..77ca7577 100644
--- a/patches/jre_21/android/jdk21u_android.diff
+++ b/patches/jre_21/android/jdk21u_android.diff
@@ -5,7 +5,7 @@ index 1fdd0143a..705b3e1f9 100644
 @@ -409,7 +409,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
    #### OS DEFINES, these should be independent on toolchain
    if test "x$OPENJDK_TARGET_OS" = xlinux; then
-     CFLAGS_OS_DEF_JVM="-DLINUX"
+     CFLAGS_OS_DEF_JVM="-DLINUX -D_FILE_OFFSET_BITS=64"
 -    CFLAGS_OS_DEF_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
 +    # CFLAGS_OS_DEF_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
 +    CFLAGS_OS_DEF_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -D__USE_BSD"
@@ -165,7 +165,7 @@ index d80b804a2..fd2a8ed15 100644
  
 -ifeq ($(call isTargetOs, linux), true)
 +ifeq ($(call isTargetOs, android linux), true)
-   DUMP_SYMBOLS_CMD := $(NM) --defined-only *$(OBJ_SUFFIX)
+   DUMP_SYMBOLS_CMD := $(NM) $(NMFLAGS) --defined-only *$(OBJ_SUFFIX)
    ifneq ($(FILTER_SYMBOLS_PATTERN), )
      FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)|
 diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
@@ -2284,7 +2284,7 @@ index 9371bc001..ab7dd0fc0 100644
  typedef int futimens_func(int, const struct timespec *);
  typedef int lutimes_func(const char *, const struct timeval *);
  typedef DIR* fdopendir_func(int);
-@@ -149,10 +150,46 @@ static fstatat64_func* my_fstatat64_func = NULL;
+@@ -149,13 +150,49 @@ static fstatat64_func* my_fstatat64_func = NULL;
  static unlinkat_func* my_unlinkat_func = NULL;
  static renameat_func* my_renameat_func = NULL;
  static futimesat_func* my_futimesat_func = NULL;
@@ -2292,6 +2292,9 @@ index 9371bc001..ab7dd0fc0 100644
  static futimens_func* my_futimens_func = NULL;
  static lutimes_func* my_lutimes_func = NULL;
  static fdopendir_func* my_fdopendir_func = NULL;
+ #if defined(__linux__)
+ static statx_func* my_statx_func = NULL;
+ #endif
  
 +#ifdef __ANDROID__
 +/*