diff options
Diffstat (limited to 'meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch')
| -rw-r--r-- | meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch b/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch index 6a875a717e..59bfae5a27 100644 --- a/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch +++ b/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch @@ -1,7 +1,8 @@ -From 5a2886f81dbca3f2ed28eebe7d27d471da278db8 Mon Sep 17 00:00:00 2001 +From 3cce8716c6c3ae2e0c835caeac3780ec35090b2d Mon Sep 17 00:00:00 2001 From: Serhey Popovych <serhe.popovych@gmail.com> Date: Tue, 11 Dec 2018 05:44:20 -0500 -Subject: [PATCH] ldso: Use syslibdir and libdir as default pathes to libdirs +Subject: [PATCH 2/2] ldso: Use syslibdir and libdir as default pathes to + libdirs In absence of /etc/ld-musl-$(ARCH).path ldso uses default path to search libraries /lib:/usr/local/lib:/usr/lib. @@ -21,10 +22,10 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index b46f8ca4..c07e4ae8 100644 +index 466d9afd..d2f458fa 100644 --- a/Makefile +++ b/Makefile -@@ -46,7 +46,8 @@ CFLAGS_AUTO = -Os -pipe +@@ -47,7 +47,8 @@ CFLAGS_AUTO = -Os -pipe CFLAGS_C99FSE = -std=c99 -ffreestanding -nostdinc CFLAGS_ALL = $(CFLAGS_C99FSE) @@ -35,19 +36,19 @@ index b46f8ca4..c07e4ae8 100644 LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) diff --git a/ldso/dynlink.c b/ldso/dynlink.c -index ec921dfd..7c119c55 100644 +index cc677952..b0e8815b 100644 --- a/ldso/dynlink.c +++ b/ldso/dynlink.c -@@ -22,6 +22,8 @@ - #include "dynlink.h" - #include "malloc_impl.h" +@@ -29,6 +29,8 @@ + #define realloc __libc_realloc + #define free __libc_free +#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR + - static void error(const char *, ...); - - #define MAXP2(a,b) (-(-(a)&-(b))) -@@ -1038,7 +1040,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by) + static void error_impl(const char *, ...); + static void error_noop(const char *, ...); + static void (*error)(const char *, ...) = error_noop; +@@ -1097,7 +1099,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by) sys_path = ""; } } @@ -57,5 +58,5 @@ index ec921dfd..7c119c55 100644 } pathname = buf; -- -2.7.4 +2.37.2 |