Skip to content

Commit 7e56375

Browse files
committed
[WRAPPER] Some fixes to bsd wrapper and essential libs handling
1 parent c13b3cc commit 7e56375

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/librarian/library.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,14 +380,14 @@ static void initDummyLib(library_t *lib)
380380

381381
static const char* essential_libs[] = {
382382
"libc.so.6", "libpthread.so.0", "librt.so.1", "libGL.so.1", "libGL.so", "libX11.so.6",
383-
"libasound.so.2", "libdl.so.2", "libm.so.6",
383+
"libasound.so.2", "libdl.so.2", "libm.so.6", "libbsd.so.0", "libbsd.so", "ld-linux.so.2"
384384
"libXxf86vm.so.1", "libXinerama.so.1", "libXrandr.so.2", "libXext.so.6", "libXfixes.so.3", "libXcursor.so.1",
385385
"libXrender.so.1", "libXft.so.2", "libXi.so.6", "libXss.so.1", "libXpm.so.4", "libXau.so.6", "libXdmcp.so.6",
386386
"libX11-xcb.so.1", "libxcb.so.1", "libxcb-xfixes.so.0", "libxcb-shape.so.0", "libxcb-shm.so.0", "libxcb-randr.so.0",
387387
"libxcb-image.so.0", "libxcb-keysyms.so.1", "libxcb-xtest.so.0", "libxcb-glx.so.0", "libxcb-dri2.so.0", "libxcb-dri3.so.0",
388388
"libXtst.so.6", "libXt.so.6", "libXcomposite.so.1", "libXdamage.so.1", "libXmu.so.6", "libxkbcommon.so.0",
389389
"libxkbcommon-x11.so.0", "libpulse-simple.so.0", "libpulse.so.0", "libvulkan.so.1", "libvulkan.so",
390-
"ld-linux-x86-64.so.2", "crashhandler.so", "libtcmalloc_minimal.so.0", "libtcmalloc_minimal.so.4"
390+
"crashhandler.so", "libtcmalloc_minimal.so.0", "libtcmalloc_minimal.so.4"
391391
};
392392
static int isEssentialLib(const char* name) {
393393
for (int i=0; i<sizeof(essential_libs)/sizeof(essential_libs[0]); ++i)

src/library_list.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
GO("libpthread.so.0", libpthread)
66
GO("librt.so.1", librt)
77
GO("libbsd.so.0", libbsd)
8+
GO("libbsd.so", libbsd)
89
GO("libGL.so.1", libgl)
910
GO("libGL.so", libgl)
1011
GO("libGLU.so.1", libglu)
@@ -183,7 +184,6 @@ GO("libpcre.so.3", libpcre)
183184
#ifdef ANDROID
184185
GO("libc.so", libc)
185186
GO("libm.so", libm)
186-
GO("libbsd.so", libbsd)
187187
GO("libdl.so", libdl)
188188
GO("libcups.so", libcups)
189189
GO("liblber-2.4.so", lber)

src/wrapped/wrappedlibbsd.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
#include "callback.h"
2020

2121

22-
#ifdef ANDROID
23-
const char* libbsdName = "libbsd.so";
24-
#else
2522
const char* libbsdName = "libbsd.so.0";
26-
#endif
23+
#define ALTNAME "libbsd.so"
24+
2725
#define LIBNAME libbsd
2826

2927
#define PRE_INIT\

0 commit comments

Comments
 (0)