summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch
diff options
context:
space:
mode:
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.patch15
1 files changed, 4 insertions, 11 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..f57aae5f3c 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
@@ -20,11 +20,9 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
20 ldso/dynlink.c | 4 +++- 20 ldso/dynlink.c | 4 +++-
21 2 files changed, 5 insertions(+), 2 deletions(-) 21 2 files changed, 5 insertions(+), 2 deletions(-)
22 22
23diff --git a/Makefile b/Makefile
24index b46f8ca4..c07e4ae8 100644
25--- a/Makefile 23--- a/Makefile
26+++ b/Makefile 24+++ b/Makefile
27@@ -46,7 +46,8 @@ CFLAGS_AUTO = -Os -pipe 25@@ -47,7 +47,8 @@ CFLAGS_AUTO = -Os -pipe
28 CFLAGS_C99FSE = -std=c99 -ffreestanding -nostdinc 26 CFLAGS_C99FSE = -std=c99 -ffreestanding -nostdinc
29 27
30 CFLAGS_ALL = $(CFLAGS_C99FSE) 28 CFLAGS_ALL = $(CFLAGS_C99FSE)
@@ -34,20 +32,18 @@ index b46f8ca4..c07e4ae8 100644
34 CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS_AUTO) $(CFLAGS) 32 CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS_AUTO) $(CFLAGS)
35 33
36 LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) 34 LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS)
37diff --git a/ldso/dynlink.c b/ldso/dynlink.c
38index ec921dfd..7c119c55 100644
39--- a/ldso/dynlink.c 35--- a/ldso/dynlink.c
40+++ b/ldso/dynlink.c 36+++ b/ldso/dynlink.c
41@@ -22,6 +22,8 @@ 37@@ -24,6 +24,8 @@
38 #include "libc.h"
42 #include "dynlink.h" 39 #include "dynlink.h"
43 #include "malloc_impl.h"
44 40
45+#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR 41+#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR
46+ 42+
47 static void error(const char *, ...); 43 static void error(const char *, ...);
48 44
49 #define MAXP2(a,b) (-(-(a)&-(b))) 45 #define MAXP2(a,b) (-(-(a)&-(b)))
50@@ -1038,7 +1040,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by) 46@@ -1071,7 +1073,7 @@ static struct dso *load_library(const ch
51 sys_path = ""; 47 sys_path = "";
52 } 48 }
53 } 49 }
@@ -56,6 +52,3 @@ index ec921dfd..7c119c55 100644
56 fd = path_open(name, sys_path, buf, sizeof buf); 52 fd = path_open(name, sys_path, buf, sizeof buf);
57 } 53 }
58 pathname = buf; 54 pathname = buf;
59--
602.7.4
61