diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-07-10 15:20:27 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-07-10 15:20:27 +0200 |
| commit | 1ea03820553cdc40e1863d473ff74ea8bcb81ff8 (patch) | |
| tree | 4be9cfe327042f365c5a414ad63a97ac87e736ec /src/wrapped | |
| parent | bd673dc791922ee92ac4ef512e3ede44edc518be (diff) | |
| download | box64-1ea03820553cdc40e1863d473ff74ea8bcb81ff8.tar.gz box64-1ea03820553cdc40e1863d473ff74ea8bcb81ff8.zip | |
[STATICBUILD] Removed libbsd build dependancy
Diffstat (limited to 'src/wrapped')
| -rw-r--r-- | src/wrapped/wrappedlibc.c | 29 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibc_private.h | 2 |
2 files changed, 30 insertions, 1 deletions
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c index b27e931b..896dd126 100644 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -3685,7 +3685,17 @@ EXPORT char my___libc_single_threaded = 0; else #endif -#ifdef ANDROID +#if defined(ANDROID) +#ifdef STATICBUILD +#define NEEDED_LIBS_DEF 3,\ + "libpthread.so", \ + "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" , \ @@ -3696,6 +3706,22 @@ EXPORT char my___libc_single_threaded = 0; "libdl.so" , \ "libm.so", \ "libbsd.so" +#endif +#else +#ifdef STATICBUILD +#define NEEDED_LIBS_DEF 5,\ + "ld-linux-x86-64.so.2", \ + "libpthread.so.0", \ + "libdl.so.2", \ + "libutil.so.1", \ + "librt.so.1" +#define NEEDED_LIBS_234 6, \ + "ld-linux-x86-64.so.2", \ + "libpthread.so.0", \ + "libdl.so.2", \ + "libutil.so.1", \ + "libresolv.so.2", \ + "librt.so.1" #else #define NEEDED_LIBS_DEF 6,\ "ld-linux-x86-64.so.2", \ @@ -3713,6 +3739,7 @@ EXPORT char my___libc_single_threaded = 0; "librt.so.1", \ "libbsd.so.0" #endif +#endif #undef HAS_MY diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h index fb4c2b8f..3f1d2e14 100644 --- a/src/wrapped/wrappedlibc_private.h +++ b/src/wrapped/wrappedlibc_private.h @@ -2459,8 +2459,10 @@ GO(__errno, pFv) #ifdef STATICBUILD GO(dummy_pFLp, pFLp) GO(dummy_pFpLLp, pFpLLp) +GO(arc4random, uFv) #else // not needed in no-static build //GO(dummy_pFLp, pFLp) //GO(dummy_pFpLLp, pFpLLp) +//GO(arc4random, uFv) #endif |