diff options
Diffstat (limited to 'meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch')
-rw-r--r-- | meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch | 11 |
1 files changed, 2 insertions, 9 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 | ||
25 | diff --git a/Makefile b/Makefile | ||
26 | index 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 | ||
38 | diff --git a/tools/install.sh b/tools/install.sh | ||
39 | index 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 | -- | ||
75 | 2.7.4 | ||
76 | |||