summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-06-25 20:45:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-28 08:35:59 +0100
commit6d26aa25248dd773c9c94a95d0e2063843757826 (patch)
tree71a2586fe9803432c4467ea97958fca7e5965db2 /meta
parentbadc7c486de84eafe1322d0c92f777c2d3b26481 (diff)
downloadpoky-6d26aa25248dd773c9c94a95d0e2063843757826.tar.gz
musl: Update to tip of master
Detailed changelog [1] Refresh patches [1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=1b4e84c56df0f8ca30f6bc05962a860f869e71df..fca7428c096066482d8c3f52450810288e27515c (From OE-Core rev: 4ce9fbb9802cb802110a684b59fdf5c9c8e7e77e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch11
-rw-r--r--meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch15
-rw-r--r--meta/recipes-core/musl/musl_git.bb2
3 files changed, 7 insertions, 21 deletions
diff --git a/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch b/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
index 462d338b96..ba00efe7b3 100644
--- a/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
+++ b/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
@@ -22,11 +22,9 @@ Upstream-Status: Pending
22 tools/install.sh | 8 +++++--- 22 tools/install.sh | 8 +++++---
23 2 files changed, 6 insertions(+), 4 deletions(-) 23 2 files changed, 6 insertions(+), 4 deletions(-)
24 24
25diff --git a/Makefile b/Makefile
26index 8246b78..d1dbe39 100644
27--- a/Makefile 25--- a/Makefile
28+++ b/Makefile 26+++ b/Makefile
29@@ -215,7 +215,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/include/% 27@@ -210,7 +210,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/inc
30 $(INSTALL) -D -m 644 $< $@ 28 $(INSTALL) -D -m 644 $< $@
31 29
32 $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so 30 $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
@@ -35,8 +33,6 @@ index 8246b78..d1dbe39 100644
35 33
36 install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),) 34 install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
37 35
38diff --git a/tools/install.sh b/tools/install.sh
39index d913b60..b6a7f79 100755
40--- a/tools/install.sh 36--- a/tools/install.sh
41+++ b/tools/install.sh 37+++ b/tools/install.sh
42@@ -6,18 +6,20 @@ 38@@ -6,18 +6,20 @@
@@ -62,7 +58,7 @@ index d913b60..b6a7f79 100755
62 m) mode=$OPTARG ;; 58 m) mode=$OPTARG ;;
63 ?) usage ;; 59 ?) usage ;;
64 esac 60 esac
65@@ -48,7 +50,7 @@ trap 'rm -f "$tmp"' EXIT INT QUIT TERM HUP 61@@ -48,7 +50,7 @@ trap 'rm -f "$tmp"' EXIT INT QUIT TERM H
66 umask 077 62 umask 077
67 63
68 if test "$symlink" ; then 64 if test "$symlink" ; then
@@ -71,6 +67,3 @@ index d913b60..b6a7f79 100755
71 else 67 else
72 cat < "$1" > "$tmp" 68 cat < "$1" > "$tmp"
73 chmod "$mode" "$tmp" 69 chmod "$mode" "$tmp"
74--
752.7.4
76
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
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 6aa69985d7..0913b09aaf 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -4,7 +4,7 @@
4require musl.inc 4require musl.inc
5inherit linuxloader 5inherit linuxloader
6 6
7SRCREV = "1b4e84c56df0f8ca30f6bc05962a860f869e71df" 7SRCREV = "fca7428c096066482d8c3f52450810288e27515c"
8 8
9BASEVER = "1.2.0" 9BASEVER = "1.2.0"
10 10