0
0
mirror of https://github.com/termux/termux-packages.git synced 2025-05-11 17:53:09 +00:00
Files
termux-packages/packages/openjdk-17/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch
Robert Kirkman 4b5aa04efa bump(main/openjdk-17): 17.0.15
- fixes https://github.com/termux/termux-packages/issues/24527

- enable `littlecms`

- change `TERMUX_PKG_SRCURL` to match the same format as `openjdk-21`

- enable auto update

- add `--with-vendor-name="Termux"` and strip extra version strings like `openjdk-21`

- enable `TERMUX_PKG_MAKE_PROCESSES`

- remove directory before installation to fix building the same architecture twice in the same docker container

- some patches are present in the new upstream repository or are unnecessary

- some patches copied from `openjdk-21` because the code associated with them appeared in the new upstream repository
2025-05-07 07:29:19 +03:00

31 lines
903 B
Diff

From ac9a6de051aa1ffea5ea1ce843954cc2fbd67e69 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@termux.dev>
Date: Sun, 31 Mar 2024 20:20:05 +0200
Subject: [PATCH 37/37] hotspot: os_linux: do not use dlinfo and
RTLD_DI_LINKMAP on android
As they are not available.
---
src/hotspot/os/linux/os_linux.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 5b429470b..5a6468053 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -1948,10 +1948,12 @@ const char* os::Linux::dll_path(void* lib) {
const char* l_path = NULL;
assert(lib != NULL, "dll_path parameter must not be NULL");
+#ifndef __ANDROID__
int res_dli = ::dlinfo(lib, RTLD_DI_LINKMAP, &lmap);
if (res_dli == 0) {
l_path = lmap->l_name;
}
+#endif
return l_path;
}
--
2.45.2