From 50623f32f642abe103d9ec7f46bd46c8c99b4ec6 Mon Sep 17 00:00:00 2001
From: KreitinnSoftware <80591934+KreitinnSoftware@users.noreply.github.com>
Date: Tue, 27 Aug 2024 03:37:40 -0300
Subject: Revert "[ANDROID] Not use 'libbsd.so' as needed lib and don't define
 NEEDED_L…" (#1762)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a7c61d8e20d8176ca956b58a4f837c54760ada0b.
---
 runTest.cmake             |  4 ++--
 src/wrapped/wrappedlibc.c | 20 ++++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/runTest.cmake b/runTest.cmake
index 4d7733f3..e9a5a46c 100644
--- a/runTest.cmake
+++ b/runTest.cmake
@@ -19,10 +19,10 @@ set(ENV{BOX64_LOG} 0)
 set(ENV{BOX64_NOBANNER} 1)
 if( EXISTS ${CMAKE_SOURCE_DIR}/x64lib )
   # we are inside box64 folder
-  set(ENV{BOX64_LD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/x64lib)
+  set(ENV{LD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/x64lib)
 else()
   # we are inside build folder
-  set(ENV{BOX64_LD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/../x64lib)
+  set(ENV{LD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/../x64lib)
 endif( EXISTS ${CMAKE_SOURCE_DIR}/x64lib )
 
 # run the test program, capture the stdout/stderr and the result var
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index bb6f73d2..4f7e6dc6 100644
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -3698,11 +3698,27 @@ __attribute__((weak)) uint32_t arc4random()
 #endif
 
 #if defined(ANDROID)
-#define NEEDED_LIBS_DEF   2,\
+#ifdef STATICBUILD
+#define NEEDED_LIBS_DEF   3,\
+    "libpthread.so",        \
     "libdl.so" ,            \
+    "libm.so"
+#define NEEDED_LIBS_234 3,  \
     "libpthread.so",        \
+    "libdl.so" ,            \
     "libm.so"
-#define NEEDED_LIBS_234 0
+#else
+#define NEEDED_LIBS_DEF   4,\
+    "libpthread.so",        \
+    "libdl.so" ,            \
+    "libm.so",              \
+    "libbsd.so"
+#define NEEDED_LIBS_234 4,  \
+    "libpthread.so",        \
+    "libdl.so" ,            \
+    "libm.so",              \
+    "libbsd.so"
+#endif
 #else
 #ifdef STATICBUILD
 #define NEEDED_LIBS_DEF   5,\
-- 
cgit 1.4.1