d087977052
Dependencies of packages from "main" set cannot be moved to
supplementary repositories.
This reverts commit 30356b7e32.
37 lines
2.4 KiB
Diff
37 lines
2.4 KiB
Diff
diff -uNr mobile-ec285598849a27f681ea6269342cf03cf382eb56/src/hotspot/os/linux/os_linux.cpp mobile-ec285598849a27f681ea6269342cf03cf382eb56.mod/src/hotspot/os/linux/os_linux.cpp
|
|
--- mobile-ec285598849a27f681ea6269342cf03cf382eb56/src/hotspot/os/linux/os_linux.cpp 2021-07-06 14:29:24.000000000 +0300
|
|
+++ mobile-ec285598849a27f681ea6269342cf03cf382eb56.mod/src/hotspot/os/linux/os_linux.cpp 2021-07-29 17:55:29.989033099 +0300
|
|
@@ -132,7 +132,7 @@
|
|
// for timer info max values which include all bits
|
|
#define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
|
|
|
|
-#if defined(MUSL_LIBC) || defined(__ANDROID__)
|
|
+#if defined(MUSL_LIBC) || defined(__ANDROID__) && !defined(__TERMUX__)
|
|
// dlvsym is not a part of POSIX
|
|
// and musl libc doesn't implement it.
|
|
static void *dlvsym(void *handle,
|
|
diff -uNr mobile-ec285598849a27f681ea6269342cf03cf382eb56/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c mobile-ec285598849a27f681ea6269342cf03cf382eb56.mod/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
|
|
--- mobile-ec285598849a27f681ea6269342cf03cf382eb56/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c 2021-07-06 14:29:24.000000000 +0300
|
|
+++ mobile-ec285598849a27f681ea6269342cf03cf382eb56.mod/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c 2021-07-29 18:11:21.496721867 +0300
|
|
@@ -155,7 +155,7 @@
|
|
static lutimes_func* my_lutimes_func = NULL;
|
|
static fdopendir_func* my_fdopendir_func = NULL;
|
|
|
|
-#ifdef __ANDROID__
|
|
+#if defined(__ANDROID__) && !defined(__TERMUX__)
|
|
/*
|
|
* TODO: Android lacks support for the methods listed below. In it's place are
|
|
* alternatives that use existing Android functionality, but lack reentrant
|
|
diff -uNr mobile-ec285598849a27f681ea6269342cf03cf382eb56/src/java.base/unix/native/libjava/java_props_md.c mobile-ec285598849a27f681ea6269342cf03cf382eb56.mod/src/java.base/unix/native/libjava/java_props_md.c
|
|
--- mobile-ec285598849a27f681ea6269342cf03cf382eb56/src/java.base/unix/native/libjava/java_props_md.c 2021-07-06 14:29:24.000000000 +0300
|
|
+++ mobile-ec285598849a27f681ea6269342cf03cf382eb56.mod/src/java.base/unix/native/libjava/java_props_md.c 2021-07-29 18:07:42.758055414 +0300
|
|
@@ -46,7 +46,7 @@
|
|
#include "java_props_macosx.h"
|
|
#endif
|
|
|
|
-#ifdef __ANDROID__
|
|
+#if defined(__ANDROID__) && !defined(__TERMUX__)
|
|
// From https://android.googlesource.com/platform/bionic/+/master/libc/bionic/langinfo.cpp
|
|
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|