8000 Revert "[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" by KreitinnSoftware · Pull Request #1762 · ptitSeb/box64 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Revert "[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" #1762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2024
Merged

Revert "[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" #1762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions runTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 18 additions & 2 deletions src/wrapped/wrappedlibc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down
0