diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch b/meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch index f985f3ca14..c3e571f8a9 100644 --- a/meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch +++ b/meta/recipes-core/glibc/glibc/0023-eglibc-Install-PIC-archives.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1947f211fab4001e84bb52868cddbd401e597889 Mon Sep 17 00:00:00 2001 | 1 | From 101568daf48d99e71b280a2fdd85460fe740d583 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 18 Mar 2015 01:57:01 +0000 | 3 | Date: Wed, 18 Mar 2015 01:57:01 +0000 |
4 | Subject: [PATCH 23/25] eglibc: Install PIC archives | 4 | Subject: [PATCH 23/26] eglibc: Install PIC archives |
5 | 5 | ||
6 | Forward port from eglibc | 6 | Forward port from eglibc |
7 | 7 | ||
@@ -29,10 +29,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
29 | 1 file changed, 40 insertions(+), 2 deletions(-) | 29 | 1 file changed, 40 insertions(+), 2 deletions(-) |
30 | 30 | ||
31 | diff --git a/Makerules b/Makerules | 31 | diff --git a/Makerules b/Makerules |
32 | index 53eabfa..1cd2a53 100644 | 32 | index 61a0240..373e628 100644 |
33 | --- a/Makerules | 33 | --- a/Makerules |
34 | +++ b/Makerules | 34 | +++ b/Makerules |
35 | @@ -694,6 +694,9 @@ ifeq ($(build-shared),yes) | 35 | @@ -762,6 +762,9 @@ ifeq ($(build-shared),yes) |
36 | $(common-objpfx)libc.so: $(common-objpfx)libc.map | 36 | $(common-objpfx)libc.so: $(common-objpfx)libc.map |
37 | endif | 37 | endif |
38 | common-generated += libc.so libc_pic.os | 38 | common-generated += libc.so libc_pic.os |
@@ -42,7 +42,7 @@ index 53eabfa..1cd2a53 100644 | |||
42 | ifdef libc.so-version | 42 | ifdef libc.so-version |
43 | $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so | 43 | $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so |
44 | $(make-link) | 44 | $(make-link) |
45 | @@ -936,6 +939,7 @@ endif | 45 | @@ -1004,6 +1007,7 @@ endif |
46 | 46 | ||
47 | install: check-install-supported | 47 | install: check-install-supported |
48 | 48 | ||
@@ -50,7 +50,7 @@ index 53eabfa..1cd2a53 100644 | |||
50 | install: $(installed-libcs) | 50 | install: $(installed-libcs) |
51 | $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force) | 51 | $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force) |
52 | $(make-target-directory) | 52 | $(make-target-directory) |
53 | @@ -964,6 +968,22 @@ versioned := $(strip $(foreach so,$(install-lib.so),\ | 53 | @@ -1032,6 +1036,22 @@ versioned := $(strip $(foreach so,$(install-lib.so),\ |
54 | install-lib.so-versioned := $(filter $(versioned), $(install-lib.so)) | 54 | install-lib.so-versioned := $(filter $(versioned), $(install-lib.so)) |
55 | install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so)) | 55 | install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so)) |
56 | 56 | ||
@@ -73,7 +73,7 @@ index 53eabfa..1cd2a53 100644 | |||
73 | # For versioned libraries, we install three files: | 73 | # For versioned libraries, we install three files: |
74 | # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script | 74 | # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script |
75 | # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink | 75 | # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink |
76 | @@ -1206,9 +1226,22 @@ $(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \ | 76 | @@ -1275,9 +1295,22 @@ $(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \ |
77 | endif # headers-nonh | 77 | endif # headers-nonh |
78 | endif # headers | 78 | endif # headers |
79 | 79 | ||
@@ -97,7 +97,7 @@ index 53eabfa..1cd2a53 100644 | |||
97 | install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin)) | 97 | install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin)) |
98 | install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script)) | 98 | install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script)) |
99 | install-rootsbin-nosubdir: \ | 99 | install-rootsbin-nosubdir: \ |
100 | @@ -1221,6 +1254,10 @@ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data)) | 100 | @@ -1290,6 +1323,10 @@ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data)) |
101 | install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers)) | 101 | install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers)) |
102 | install-others-nosubdir: $(install-others) | 102 | install-others-nosubdir: $(install-others) |
103 | install-others-programs-nosubdir: $(install-others-programs) | 103 | install-others-programs-nosubdir: $(install-others-programs) |
@@ -108,7 +108,7 @@ index 53eabfa..1cd2a53 100644 | |||
108 | 108 | ||
109 | # We need all the `-nosubdir' targets so that `install' in the parent | 109 | # We need all the `-nosubdir' targets so that `install' in the parent |
110 | # doesn't depend on several things which each iterate over the subdirs. | 110 | # doesn't depend on several things which each iterate over the subdirs. |
111 | @@ -1230,7 +1267,8 @@ install-%:: install-%-nosubdir ; | 111 | @@ -1299,7 +1336,8 @@ install-%:: install-%-nosubdir ; |
112 | 112 | ||
113 | .PHONY: install install-no-libc.a-nosubdir | 113 | .PHONY: install install-no-libc.a-nosubdir |
114 | install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \ | 114 | install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \ |
@@ -119,5 +119,5 @@ index 53eabfa..1cd2a53 100644 | |||
119 | install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \ | 119 | install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \ |
120 | install-rootsbin-nosubdir install-sbin-nosubdir \ | 120 | install-rootsbin-nosubdir install-sbin-nosubdir \ |
121 | -- | 121 | -- |
122 | 2.8.2 | 122 | 2.10.2 |
123 | 123 | ||