TheCloud/angelauramc-openjdk-build
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/angelauramc-openjdk-build.git synced 2025-09-09 04:08:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix: update patches for master jre21

Browse Source
This commit is contained in:
Mathias-Boulay 2024-11-23 20:52:47 +01:00
parent 655141c7ae
commit 95c88f97f1
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
5_clonejdk.sh
View File

@ -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

9
Dockerfile
View File

@ -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 \

9
patches/jre_21/android/jdk21u_android.diff
View File

@ -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__
+/*