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

Workaround: skip check for ipv6 support (by @nexplorer-3e)

Browse Source 
The commit is made instead of PR merge because the PR has a weird file in it
This commit is contained in:
Mathias-Boulay 2024-07-27 19:53:24 +02:00
parent 471ca51954
commit 691cab34d7
3 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/jre_17/android/26_skip_proc_net6_check.diff Normal file
View File

@ -0,0 +1,21 @@
// skip some checks as AOSP does
diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c
index 4ec11a136..01b85db4d 100644
--- a/src/java.base/unix/native/libnet/net_util_md.c
+++ b/src/java.base/unix/native/libnet/net_util_md.c
@@ -129,6 +129,7 @@ jint IPv6_supported()
SOCKETADDRESS sa;
socklen_t sa_len = sizeof(SOCKETADDRESS);
+#ifndef __ANDROID__ // ANDROID: skip check, see libcore commit ae218d9b
fd = socket(AF_INET6, SOCK_STREAM, 0) ;
if (fd < 0) {
/*
@@ -172,6 +173,7 @@ jint IPv6_supported()
}
}
#endif
+#endif // !defined __ANDROID__
/*
* OK we may have the stack available in the kernel,

21
patches/jre_21/android/26_skip_proc_net6_check.diff Normal file
View File

@ -0,0 +1,21 @@
// skip some checks as AOSP does
diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c
index 4ec11a136..01b85db4d 100644
--- a/src/java.base/unix/native/libnet/net_util_md.c
+++ b/src/java.base/unix/native/libnet/net_util_md.c
@@ -129,6 +129,7 @@ jint IPv6_supported()
SOCKETADDRESS sa;
socklen_t sa_len = sizeof(SOCKETADDRESS);
+#ifndef __ANDROID__ // ANDROID: skip check, see libcore commit ae218d9b
fd = socket(AF_INET6, SOCK_STREAM, 0) ;
if (fd < 0) {
/*
@@ -172,6 +173,7 @@ jint IPv6_supported()
}
}
#endif
+#endif // !defined __ANDROID__
/*
* OK we may have the stack available in the kernel,

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

@ -2258,6 +2258,26 @@ index 21ef40688..b8c2520d2 100644
#endif #endif
if (exec_path == NULL) { if (exec_path == NULL) {
diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c
index 4ec11a136..01b85db4d 100644
--- a/src/java.base/unix/native/libnet/net_util_md.c
+++ b/src/java.base/unix/native/libnet/net_util_md.c
@@ -129,6 +129,7 @@ jint IPv6_supported()
SOCKETADDRESS sa;
socklen_t sa_len = sizeof(SOCKETADDRESS);
+#ifndef __ANDROID__ // ANDROID: skip check, see libcore commit ae218d9b
fd = socket(AF_INET6, SOCK_STREAM, 0) ;
if (fd < 0) {
/*
@@ -172,6 +173,7 @@ jint IPv6_supported()
}
}
#endif
+#endif // !defined __ANDROID__
/*
* OK we may have the stack available in the kernel,
diff --git a/src/java.base/unix/native/libnet/net_util_md.h b/src/java.base/unix/native/libnet/net_util_md.h diff --git a/src/java.base/unix/native/libnet/net_util_md.h b/src/java.base/unix/native/libnet/net_util_md.h
index 902cf9673..3b8acd66b 100644 index 902cf9673..3b8acd66b 100644
--- a/src/java.base/unix/native/libnet/net_util_md.h --- a/src/java.base/unix/native/libnet/net_util_md.h