diff options
| author | KreitinnSoftware <80591934+KreitinnSoftware@users.noreply.github.com> | 2024-08-25 14:53:09 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-25 19:53:09 +0200 |
| commit | a7c61d8e20d8176ca956b58a4f837c54760ada0b (patch) | |
| tree | 3c6d858567d5904688cc420d66b884f97a204979 | |
| parent | 4988fb27dc115e89146a017d0dff2a33abbc25e1 (diff) | |
| download | box64-a7c61d8e20d8176ca956b58a4f837c54760ada0b.tar.gz box64-a7c61d8e20d8176ca956b58a4f837c54760ada0b.zip | |
[ANDROID] Not use 'libbsd.so' as needed lib and don't define NEEDED_LIBS_234 for Android Too, Use BOX64_LD_LIBRARY_PATH instead of LD_LIBRARY_PATH on CTEST (#1754)
* [ANDROID] Not use 'libbsd.so', 'libpthread.so' as needed libs and don't define NEEDED_LIBS_234 for Android Too * [ANDROID] Use 'libpthread.so' again * [CTEST] Try to use BOX64_LD_LIBRARY_PATH instead of LD_LIBRARY_PATH
| -rw-r--r-- | runTest.cmake | 4 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibc.c | 20 |
2 files changed, 4 insertions, 20 deletions
diff --git a/runTest.cmake b/runTest.cmake index e9a5a46c..4d7733f3 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{LD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/x64lib) + set(ENV{BOX64_LD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/x64lib) else() # we are inside build folder - set(ENV{LD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/../x64lib) + set(ENV{BOX64_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 4f7e6dc6..bb6f73d2 100644 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -3698,27 +3698,11 @@ __attribute__((weak)) uint32_t arc4random() #endif #if defined(ANDROID) -#ifdef STATICBUILD -#define NEEDED_LIBS_DEF 3,\ - "libpthread.so", \ +#define NEEDED_LIBS_DEF 2,\ "libdl.so" , \ - "libm.so" -#define NEEDED_LIBS_234 3, \ "libpthread.so", \ - "libdl.so" , \ "libm.so" -#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 +#define NEEDED_LIBS_234 0 #else #ifdef STATICBUILD #define NEEDED_LIBS_DEF 5,\ |