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 | 20 |
1 files changed, 14 insertions, 6 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 0aeb5eb5c2..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 @@ | |||
1 | From 5a2886f81dbca3f2ed28eebe7d27d471da278db8 Mon Sep 17 00:00:00 2001 | 1 | From 3cce8716c6c3ae2e0c835caeac3780ec35090b2d Mon Sep 17 00:00:00 2001 |
2 | From: Serhey Popovych <serhe.popovych@gmail.com> | 2 | From: Serhey Popovych <serhe.popovych@gmail.com> |
3 | Date: Tue, 11 Dec 2018 05:44:20 -0500 | 3 | Date: Tue, 11 Dec 2018 05:44:20 -0500 |
4 | Subject: [PATCH] ldso: Use syslibdir and libdir as default pathes to libdirs | 4 | Subject: [PATCH 2/2] ldso: Use syslibdir and libdir as default pathes to |
5 | libdirs | ||
5 | 6 | ||
6 | In absence of /etc/ld-musl-$(ARCH).path ldso uses default path to search | 7 | In absence of /etc/ld-musl-$(ARCH).path ldso uses default path to search |
7 | libraries /lib:/usr/local/lib:/usr/lib. | 8 | libraries /lib:/usr/local/lib:/usr/lib. |
@@ -20,6 +21,8 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> | |||
20 | ldso/dynlink.c | 4 +++- | 21 | ldso/dynlink.c | 4 +++- |
21 | 2 files changed, 5 insertions(+), 2 deletions(-) | 22 | 2 files changed, 5 insertions(+), 2 deletions(-) |
22 | 23 | ||
24 | diff --git a/Makefile b/Makefile | ||
25 | index 466d9afd..d2f458fa 100644 | ||
23 | --- a/Makefile | 26 | --- a/Makefile |
24 | +++ b/Makefile | 27 | +++ b/Makefile |
25 | @@ -47,7 +47,8 @@ CFLAGS_AUTO = -Os -pipe | 28 | @@ -47,7 +47,8 @@ CFLAGS_AUTO = -Os -pipe |
@@ -32,6 +35,8 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> | |||
32 | CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS_AUTO) $(CFLAGS) | 35 | CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS_AUTO) $(CFLAGS) |
33 | 36 | ||
34 | LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) | 37 | LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) |
38 | diff --git a/ldso/dynlink.c b/ldso/dynlink.c | ||
39 | index cc677952..b0e8815b 100644 | ||
35 | --- a/ldso/dynlink.c | 40 | --- a/ldso/dynlink.c |
36 | +++ b/ldso/dynlink.c | 41 | +++ b/ldso/dynlink.c |
37 | @@ -29,6 +29,8 @@ | 42 | @@ -29,6 +29,8 @@ |
@@ -40,10 +45,10 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> | |||
40 | 45 | ||
41 | +#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR | 46 | +#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR |
42 | + | 47 | + |
43 | static void error(const char *, ...); | 48 | static void error_impl(const char *, ...); |
44 | 49 | static void error_noop(const char *, ...); | |
45 | #define MAXP2(a,b) (-(-(a)&-(b))) | 50 | static void (*error)(const char *, ...) = error_noop; |
46 | @@ -1094,7 +1096,7 @@ static struct dso *load_library(const ch | 51 | @@ -1097,7 +1099,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by) |
47 | sys_path = ""; | 52 | sys_path = ""; |
48 | } | 53 | } |
49 | } | 54 | } |
@@ -52,3 +57,6 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> | |||
52 | fd = path_open(name, sys_path, buf, sizeof buf); | 57 | fd = path_open(name, sys_path, buf, sizeof buf); |
53 | } | 58 | } |
54 | pathname = buf; | 59 | pathname = buf; |
60 | -- | ||
61 | 2.37.2 | ||
62 | |||