diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2023-12-01 10:45:59 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2023-12-01 10:45:59 +0100 |
| commit | 1bd928a766d2ce170437a72d8c5099fddcebbc34 (patch) | |
| tree | fca4229d6ed4d9cd0f5ab14bfa139bbad047b2ea /src | |
| parent | e493b0775d942a8b052240a334765ac78948d7bd (diff) | |
| download | box64-1bd928a766d2ce170437a72d8c5099fddcebbc34.tar.gz box64-1bd928a766d2ce170437a72d8c5099fddcebbc34.zip | |
[ANDROID] Try to fix libbsd issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/library_list.h | 2 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibbsd.c | 4 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibc.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/library_list.h b/src/library_list.h index 5396c855..8c75e4c5 100644 --- a/src/library_list.h +++ b/src/library_list.h @@ -5,6 +5,7 @@ GO("libc.musl-x86_64.so.1", libcmusl) GO("libpthread.so.0", libpthread) GO("librt.so.1", librt) +GO("libbsd.so.0", libbsd) GO("libEGL.so.1", libegl) GO("libGL.so.1", libgl) GO("libGL.so", libgl) @@ -331,7 +332,6 @@ GO("libandroid-shmem.so", androidshmem) GO("libc.so.6", libc) GO("libm.so.6", libm) GO("libdl.so.2", libdl) -GO("libbsd.so.0", libbsd) GO("libcups.so.2", libcups) GO("liblber-2.4.so.2", lber) GO("libldap_r-2.4.so.2", ldapr) diff --git a/src/wrapped/wrappedlibbsd.c b/src/wrapped/wrappedlibbsd.c index 6147a006..8937ed9d 100644 --- a/src/wrapped/wrappedlibbsd.c +++ b/src/wrapped/wrappedlibbsd.c @@ -17,7 +17,11 @@ #include "x64tls.h" +#ifdef ANDROID +const char* libbsdName = "libbsd.so"; +#else const char* libbsdName = "libbsd.so.0"; +#endif #define LIBNAME libbsd #define PRE_INIT\ diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c index 60aac36a..6a76eab1 100644 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -3360,7 +3360,8 @@ EXPORT char my___libc_single_threaded = 0; else #ifdef ANDROID -#define NEEDED_LIBS 0 +#define NEEDED_LIBS 1, \ + "libbsd.so" #define NEEDED_LIBS_234 4, \ "libpthread.so.0", \ "libdl.so.2" , \ |