1 |
Remove most of the patches since they have been moved to |
2 |
app-portage/elt-patches. Leave nocxx patches for now since they are |
3 |
needed for epunt_cxx, and we do not want to expose the dependency to all |
4 |
packages using eutils. |
5 |
--- |
6 |
eclass/ELT-patches/aixrtl/1.5.0-cmds-c | 11 - |
7 |
eclass/ELT-patches/aixrtl/1.5.0-cmds-cxx | 11 - |
8 |
eclass/ELT-patches/aixrtl/1.5.0-expsym-c | 16 - |
9 |
eclass/ELT-patches/aixrtl/1.5.0-expsym-cxx | 16 - |
10 |
eclass/ELT-patches/aixrtl/1.5.0-noundef-c | 11 - |
11 |
eclass/ELT-patches/aixrtl/1.5.0-noundef-cxx | 11 - |
12 |
eclass/ELT-patches/aixrtl/1.5.0-soname | 13 - |
13 |
eclass/ELT-patches/aixrtl/1.5.0-usertl-c | 10 - |
14 |
eclass/ELT-patches/aixrtl/1.5.0-usertl-cxx | 10 - |
15 |
eclass/ELT-patches/aixrtl/1.5.22-cmds-c | 11 - |
16 |
eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx | 11 - |
17 |
eclass/ELT-patches/aixrtl/2.0.0-fpic-c | 12 - |
18 |
eclass/ELT-patches/aixrtl/2.0.0-fpic-cxx | 12 - |
19 |
eclass/ELT-patches/aixrtl/2.2.0-cmds-c | 11 - |
20 |
eclass/ELT-patches/aixrtl/2.2.0-cmds-cxx | 11 - |
21 |
eclass/ELT-patches/aixrtl/2.2.0-expsym-c | 16 - |
22 |
eclass/ELT-patches/aixrtl/2.2.0-expsym-cxx | 16 - |
23 |
eclass/ELT-patches/aixrtl/2.2.0-noundef-c | 11 - |
24 |
eclass/ELT-patches/aixrtl/2.2.0-noundef-cxx | 11 - |
25 |
eclass/ELT-patches/aixrtl/2.2.0-usertl-cxx | 10 - |
26 |
eclass/ELT-patches/aixrtl/2.2.8-cmds-c | 11 - |
27 |
eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx | 11 - |
28 |
eclass/ELT-patches/aixrtl/2.4.0-expsym-c | 16 - |
29 |
eclass/ELT-patches/aixrtl/2.4.0-expsym-cxx | 16 - |
30 |
eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c | 11 - |
31 |
eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx | 11 - |
32 |
eclass/ELT-patches/aixrtl/2.4.2.418-soname | 12 - |
33 |
eclass/ELT-patches/aixrtl/2.4.4-expsym-c | 21 - |
34 |
eclass/ELT-patches/aixrtl/2.4.4-expsym-cxx | 21 - |
35 |
eclass/ELT-patches/aixrtl/2.4.4-with-svr4 | 11 - |
36 |
eclass/ELT-patches/as-needed/1.5 | 30 -- |
37 |
eclass/ELT-patches/as-needed/1.5.26 | 38 -- |
38 |
eclass/ELT-patches/as-needed/2.2.6 | 38 -- |
39 |
eclass/ELT-patches/as-needed/2.4.2 | 38 -- |
40 |
eclass/ELT-patches/as-needed/2.4.3 | 38 -- |
41 |
eclass/ELT-patches/cross/2.2 | 20 - |
42 |
eclass/ELT-patches/cross/2.4 | 20 - |
43 |
eclass/ELT-patches/cross/2.4.3 | 21 - |
44 |
eclass/ELT-patches/darwin-conf/1.5 | 24 - |
45 |
eclass/ELT-patches/darwin-conf/1.5b | 33 -- |
46 |
eclass/ELT-patches/darwin-conf/2.2.4 | 29 -- |
47 |
eclass/ELT-patches/darwin-conf/2.2.6 | 43 -- |
48 |
eclass/ELT-patches/darwin-conf/2.4.6 | 29 -- |
49 |
eclass/ELT-patches/darwin-ltconf/1.2.0 | 66 --- |
50 |
eclass/ELT-patches/darwin-ltconf/1.3.0 | 67 --- |
51 |
eclass/ELT-patches/darwin-ltmain/1.2.0 | 40 -- |
52 |
eclass/ELT-patches/darwin-ltmain/1.3.0 | 64 --- |
53 |
eclass/ELT-patches/deplibs/1.5 | 18 - |
54 |
eclass/ELT-patches/deplibs/2.1b | 18 - |
55 |
eclass/ELT-patches/fbsd-conf/00broken-libglade | 33 -- |
56 |
eclass/ELT-patches/fbsd-conf/1.4.0 | 32 -- |
57 |
eclass/ELT-patches/fbsd-conf/1.5.10 | 120 ----- |
58 |
eclass/ELT-patches/fbsd-conf/1.5.18 | 116 ----- |
59 |
eclass/ELT-patches/fbsd-conf/1.5.20 | 116 ----- |
60 |
eclass/ELT-patches/fbsd-conf/1.5.20b | 61 --- |
61 |
eclass/ELT-patches/fbsd-conf/1.9f | 60 --- |
62 |
eclass/ELT-patches/fbsd-ltconf/1.2.0 | 26 -- |
63 |
eclass/ELT-patches/fbsd-ltconf/1.3.0 | 32 -- |
64 |
eclass/ELT-patches/fbsd-ltconf/1.4a | 32 -- |
65 |
eclass/ELT-patches/fbsd-ltconf/1.4a-GCC3.0 | 32 -- |
66 |
eclass/ELT-patches/fix-relink/1.4.0 | 63 --- |
67 |
eclass/ELT-patches/fix-relink/1.4.3 | 62 --- |
68 |
eclass/ELT-patches/fix-relink/1.5.0 | 51 --- |
69 |
eclass/ELT-patches/gold-conf/2.2.6 | 10 - |
70 |
eclass/ELT-patches/hardcode-relink/1.3d | 8 - |
71 |
eclass/ELT-patches/hardcode/1.3d | 21 - |
72 |
eclass/ELT-patches/hardcode/2.1b | 36 -- |
73 |
eclass/ELT-patches/hc-flag-ld/1.5 | 18 - |
74 |
eclass/ELT-patches/hpux-conf/1.5.22-syslibpath | 24 - |
75 |
eclass/ELT-patches/install-sh/1.5 | 14 - |
76 |
eclass/ELT-patches/install-sh/1.5.4 | 14 - |
77 |
eclass/ELT-patches/install-sh/1.5.6 | 14 - |
78 |
eclass/ELT-patches/irix-ltmain/2.2.6 | 30 -- |
79 |
eclass/ELT-patches/ltmain/1.5 | 18 - |
80 |
eclass/ELT-patches/max_cmd_len/1.5.0 | 33 -- |
81 |
eclass/ELT-patches/max_cmd_len/1.5.14 | 33 -- |
82 |
eclass/ELT-patches/max_cmd_len/1.5.20 | 33 -- |
83 |
eclass/ELT-patches/mint-conf/2.2.6 | 15 - |
84 |
eclass/ELT-patches/no-lc/1.3d | 13 - |
85 |
eclass/ELT-patches/no-lc/1.5.22 | 11 - |
86 |
eclass/ELT-patches/portage/1.2.0 | 7 - |
87 |
eclass/ELT-patches/portage/1.3.0c | 66 --- |
88 |
eclass/ELT-patches/portage/1.3.3 | 71 --- |
89 |
eclass/ELT-patches/portage/1.4.0 | 74 ---- |
90 |
eclass/ELT-patches/portage/1.5.10 | 77 ---- |
91 |
eclass/ELT-patches/portage/2.2 | 69 --- |
92 |
eclass/ELT-patches/ppc64le/2.4.2 | 32 -- |
93 |
eclass/ELT-patches/ppc64le/2.4.4 | 21 - |
94 |
eclass/ELT-patches/relink-prog/1.3d | 24 - |
95 |
eclass/ELT-patches/relink-prog/2.1b | 24 - |
96 |
eclass/ELT-patches/relink/1.4.0a | 99 ----- |
97 |
eclass/ELT-patches/relink/1.4.0a-GCC3.0-1 | 99 ----- |
98 |
eclass/ELT-patches/relink/1.4.0a-GCC3.0-2 | 100 ----- |
99 |
eclass/ELT-patches/relink/1.4.1 | 124 ------ |
100 |
eclass/ELT-patches/relink/1.4.2 | 99 ----- |
101 |
eclass/ELT-patches/relink/1.4.3 | 111 ----- |
102 |
eclass/ELT-patches/rem-int-dep/1.3.5 | 11 - |
103 |
eclass/ELT-patches/sed/1.3.4 | 14 - |
104 |
eclass/ELT-patches/sed/1.4.0 | 14 - |
105 |
eclass/ELT-patches/sed/1.5.6 | 16 - |
106 |
eclass/ELT-patches/sol2-conf/2.4.2 | 14 - |
107 |
eclass/ELT-patches/sol2-ltmain/2.4.2 | 11 - |
108 |
eclass/ELT-patches/sys-lib-dlsearch/2.4 | 21 - |
109 |
eclass/ELT-patches/target-nm/2.4.2 | 45 -- |
110 |
eclass/ELT-patches/test/1.4.0 | 291 ------------- |
111 |
eclass/ELT-patches/test/1.4.2 | 578 ------------------------- |
112 |
eclass/ELT-patches/tmp/1.3.5 | 15 - |
113 |
eclass/ELT-patches/uclibc-conf/1.2.0 | 48 -- |
114 |
eclass/ELT-patches/uclibc-conf/1.3.0c | 48 -- |
115 |
eclass/ELT-patches/uclibc-ltconf/1.2.0 | 36 -- |
116 |
eclass/ELT-patches/uclibc-ltconf/1.3.0 | 39 -- |
117 |
111 files changed, 4535 deletions(-) |
118 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.0-cmds-c |
119 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.0-cmds-cxx |
120 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.0-expsym-c |
121 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.0-expsym-cxx |
122 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.0-noundef-c |
123 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.0-noundef-cxx |
124 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.0-soname |
125 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.0-usertl-c |
126 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.0-usertl-cxx |
127 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.22-cmds-c |
128 |
delete mode 100644 eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx |
129 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.0.0-fpic-c |
130 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.0.0-fpic-cxx |
131 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.2.0-cmds-c |
132 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.2.0-cmds-cxx |
133 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.2.0-expsym-c |
134 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.2.0-expsym-cxx |
135 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.2.0-noundef-c |
136 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.2.0-noundef-cxx |
137 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.2.0-usertl-cxx |
138 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.2.8-cmds-c |
139 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx |
140 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.4.0-expsym-c |
141 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.4.0-expsym-cxx |
142 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c |
143 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx |
144 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.4.2.418-soname |
145 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.4.4-expsym-c |
146 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.4.4-expsym-cxx |
147 |
delete mode 100644 eclass/ELT-patches/aixrtl/2.4.4-with-svr4 |
148 |
delete mode 100644 eclass/ELT-patches/as-needed/1.5 |
149 |
delete mode 100644 eclass/ELT-patches/as-needed/1.5.26 |
150 |
delete mode 100644 eclass/ELT-patches/as-needed/2.2.6 |
151 |
delete mode 100644 eclass/ELT-patches/as-needed/2.4.2 |
152 |
delete mode 100644 eclass/ELT-patches/as-needed/2.4.3 |
153 |
delete mode 100644 eclass/ELT-patches/cross/2.2 |
154 |
delete mode 100644 eclass/ELT-patches/cross/2.4 |
155 |
delete mode 100644 eclass/ELT-patches/cross/2.4.3 |
156 |
delete mode 100644 eclass/ELT-patches/darwin-conf/1.5 |
157 |
delete mode 100644 eclass/ELT-patches/darwin-conf/1.5b |
158 |
delete mode 100644 eclass/ELT-patches/darwin-conf/2.2.4 |
159 |
delete mode 100644 eclass/ELT-patches/darwin-conf/2.2.6 |
160 |
delete mode 100644 eclass/ELT-patches/darwin-conf/2.4.6 |
161 |
delete mode 100644 eclass/ELT-patches/darwin-ltconf/1.2.0 |
162 |
delete mode 100644 eclass/ELT-patches/darwin-ltconf/1.3.0 |
163 |
delete mode 100644 eclass/ELT-patches/darwin-ltmain/1.2.0 |
164 |
delete mode 100644 eclass/ELT-patches/darwin-ltmain/1.3.0 |
165 |
delete mode 100644 eclass/ELT-patches/deplibs/1.5 |
166 |
delete mode 100644 eclass/ELT-patches/deplibs/2.1b |
167 |
delete mode 100644 eclass/ELT-patches/fbsd-conf/00broken-libglade |
168 |
delete mode 100644 eclass/ELT-patches/fbsd-conf/1.4.0 |
169 |
delete mode 100644 eclass/ELT-patches/fbsd-conf/1.5.10 |
170 |
delete mode 100644 eclass/ELT-patches/fbsd-conf/1.5.18 |
171 |
delete mode 100644 eclass/ELT-patches/fbsd-conf/1.5.20 |
172 |
delete mode 100644 eclass/ELT-patches/fbsd-conf/1.5.20b |
173 |
delete mode 100644 eclass/ELT-patches/fbsd-conf/1.9f |
174 |
delete mode 100644 eclass/ELT-patches/fbsd-ltconf/1.2.0 |
175 |
delete mode 100644 eclass/ELT-patches/fbsd-ltconf/1.3.0 |
176 |
delete mode 100644 eclass/ELT-patches/fbsd-ltconf/1.4a |
177 |
delete mode 100644 eclass/ELT-patches/fbsd-ltconf/1.4a-GCC3.0 |
178 |
delete mode 100644 eclass/ELT-patches/fix-relink/1.4.0 |
179 |
delete mode 100644 eclass/ELT-patches/fix-relink/1.4.3 |
180 |
delete mode 100644 eclass/ELT-patches/fix-relink/1.5.0 |
181 |
delete mode 100644 eclass/ELT-patches/gold-conf/2.2.6 |
182 |
delete mode 100644 eclass/ELT-patches/hardcode-relink/1.3d |
183 |
delete mode 100644 eclass/ELT-patches/hardcode/1.3d |
184 |
delete mode 100644 eclass/ELT-patches/hardcode/2.1b |
185 |
delete mode 100644 eclass/ELT-patches/hc-flag-ld/1.5 |
186 |
delete mode 100644 eclass/ELT-patches/hpux-conf/1.5.22-syslibpath |
187 |
delete mode 100644 eclass/ELT-patches/install-sh/1.5 |
188 |
delete mode 100644 eclass/ELT-patches/install-sh/1.5.4 |
189 |
delete mode 100644 eclass/ELT-patches/install-sh/1.5.6 |
190 |
delete mode 100644 eclass/ELT-patches/irix-ltmain/2.2.6 |
191 |
delete mode 100644 eclass/ELT-patches/ltmain/1.5 |
192 |
delete mode 100644 eclass/ELT-patches/max_cmd_len/1.5.0 |
193 |
delete mode 100644 eclass/ELT-patches/max_cmd_len/1.5.14 |
194 |
delete mode 100644 eclass/ELT-patches/max_cmd_len/1.5.20 |
195 |
delete mode 100644 eclass/ELT-patches/mint-conf/2.2.6 |
196 |
delete mode 100644 eclass/ELT-patches/no-lc/1.3d |
197 |
delete mode 100644 eclass/ELT-patches/no-lc/1.5.22 |
198 |
delete mode 100644 eclass/ELT-patches/portage/1.2.0 |
199 |
delete mode 100644 eclass/ELT-patches/portage/1.3.0c |
200 |
delete mode 100644 eclass/ELT-patches/portage/1.3.3 |
201 |
delete mode 100644 eclass/ELT-patches/portage/1.4.0 |
202 |
delete mode 100644 eclass/ELT-patches/portage/1.5.10 |
203 |
delete mode 100644 eclass/ELT-patches/portage/2.2 |
204 |
delete mode 100644 eclass/ELT-patches/ppc64le/2.4.2 |
205 |
delete mode 100644 eclass/ELT-patches/ppc64le/2.4.4 |
206 |
delete mode 100644 eclass/ELT-patches/relink-prog/1.3d |
207 |
delete mode 100644 eclass/ELT-patches/relink-prog/2.1b |
208 |
delete mode 100644 eclass/ELT-patches/relink/1.4.0a |
209 |
delete mode 100644 eclass/ELT-patches/relink/1.4.0a-GCC3.0-1 |
210 |
delete mode 100644 eclass/ELT-patches/relink/1.4.0a-GCC3.0-2 |
211 |
delete mode 100644 eclass/ELT-patches/relink/1.4.1 |
212 |
delete mode 100644 eclass/ELT-patches/relink/1.4.2 |
213 |
delete mode 100644 eclass/ELT-patches/relink/1.4.3 |
214 |
delete mode 100644 eclass/ELT-patches/rem-int-dep/1.3.5 |
215 |
delete mode 100644 eclass/ELT-patches/sed/1.3.4 |
216 |
delete mode 100644 eclass/ELT-patches/sed/1.4.0 |
217 |
delete mode 100644 eclass/ELT-patches/sed/1.5.6 |
218 |
delete mode 100644 eclass/ELT-patches/sol2-conf/2.4.2 |
219 |
delete mode 100644 eclass/ELT-patches/sol2-ltmain/2.4.2 |
220 |
delete mode 100644 eclass/ELT-patches/sys-lib-dlsearch/2.4 |
221 |
delete mode 100644 eclass/ELT-patches/target-nm/2.4.2 |
222 |
delete mode 100644 eclass/ELT-patches/test/1.4.0 |
223 |
delete mode 100644 eclass/ELT-patches/test/1.4.2 |
224 |
delete mode 100644 eclass/ELT-patches/tmp/1.3.5 |
225 |
delete mode 100644 eclass/ELT-patches/uclibc-conf/1.2.0 |
226 |
delete mode 100644 eclass/ELT-patches/uclibc-conf/1.3.0c |
227 |
delete mode 100644 eclass/ELT-patches/uclibc-ltconf/1.2.0 |
228 |
delete mode 100644 eclass/ELT-patches/uclibc-ltconf/1.3.0 |
229 |
|
230 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-cmds-c b/eclass/ELT-patches/aixrtl/1.5.0-cmds-c |
231 |
deleted file mode 100644 |
232 |
index 9be05686ad79..000000000000 |
233 |
--- a/eclass/ELT-patches/aixrtl/1.5.0-cmds-c |
234 |
+++ /dev/null |
235 |
@@ -1,11 +0,0 @@ |
236 |
---- configure |
237 |
-+++ configure |
238 |
-@@ -7234,7 +7235,7 @@ |
239 |
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
240 |
- |
241 |
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
242 |
-- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
243 |
-+ archive_expsym_cmds='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~rm -f -r $lib.d' |
244 |
- else |
245 |
- if test "$host_cpu" = ia64; then |
246 |
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
247 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-cmds-cxx b/eclass/ELT-patches/aixrtl/1.5.0-cmds-cxx |
248 |
deleted file mode 100644 |
249 |
index 13ffb7ac4c09..000000000000 |
250 |
--- a/eclass/ELT-patches/aixrtl/1.5.0-cmds-cxx |
251 |
+++ /dev/null |
252 |
@@ -1,11 +0,0 @@ |
253 |
---- configure |
254 |
-+++ configure |
255 |
-@@ -10041,7 +10043,7 @@ |
256 |
- |
257 |
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
258 |
- |
259 |
-- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
260 |
-+ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~rm -f -r $lib.d' |
261 |
- else |
262 |
- if test "$host_cpu" = ia64; then |
263 |
- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' |
264 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-expsym-c b/eclass/ELT-patches/aixrtl/1.5.0-expsym-c |
265 |
deleted file mode 100644 |
266 |
index df2e9798255f..000000000000 |
267 |
--- a/eclass/ELT-patches/aixrtl/1.5.0-expsym-c |
268 |
+++ /dev/null |
269 |
@@ -1,16 +0,0 @@ |
270 |
---- configure |
271 |
-+++ configure |
272 |
-@@ -7113,9 +7113,11 @@ |
273 |
- # If we're using GNU nm, then we don't want the "-C" option. |
274 |
- # -C means demangle to AIX nm, but means don't demangle with GNU nm |
275 |
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then |
276 |
-- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' |
277 |
-+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
278 |
-+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
279 |
- else |
280 |
-- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' |
281 |
-+ export_symbols_cmds='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
282 |
-+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
283 |
- fi |
284 |
- aix_use_runtimelinking=no |
285 |
- |
286 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-expsym-cxx b/eclass/ELT-patches/aixrtl/1.5.0-expsym-cxx |
287 |
deleted file mode 100644 |
288 |
index fcc31d5696fe..000000000000 |
289 |
--- a/eclass/ELT-patches/aixrtl/1.5.0-expsym-cxx |
290 |
+++ /dev/null |
291 |
@@ -1,16 +0,0 @@ |
292 |
---- configure |
293 |
-+++ configure |
294 |
-@@ -11217,9 +11217,11 @@ |
295 |
- # If we're using GNU nm, then we don't want the "-C" option. |
296 |
- # -C means demangle to AIX nm, but means don't demangle with GNU nm |
297 |
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then |
298 |
-- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' |
299 |
-+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
300 |
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
301 |
- else |
302 |
-- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' |
303 |
-+ export_symbols_cmds_CXX='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
304 |
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
305 |
- fi |
306 |
- ;; |
307 |
- pw32*) |
308 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-noundef-c b/eclass/ELT-patches/aixrtl/1.5.0-noundef-c |
309 |
deleted file mode 100644 |
310 |
index c893f9c6ab70..000000000000 |
311 |
--- a/eclass/ELT-patches/aixrtl/1.5.0-noundef-c |
312 |
+++ /dev/null |
313 |
@@ -1,11 +0,0 @@ |
314 |
---- configure |
315 |
-+++ configure |
316 |
-@@ -7189,7 +7190,7 @@ |
317 |
- if test "$aix_use_runtimelinking" = yes; then |
318 |
- # Warning - without using the other runtime loading flags (-brtl), |
319 |
- # -berok will link without error, but may produce a broken library. |
320 |
-- allow_undefined_flag='-berok' |
321 |
-+ no_undefined_flag=' ${wl}-bernotok' |
322 |
- # Determine the default libpath from the value encoded in an empty executable. |
323 |
- cat >conftest.$ac_ext <<_ACEOF |
324 |
- #line $LINENO "configure" |
325 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-noundef-cxx b/eclass/ELT-patches/aixrtl/1.5.0-noundef-cxx |
326 |
deleted file mode 100644 |
327 |
index dc01fcab6dd2..000000000000 |
328 |
--- a/eclass/ELT-patches/aixrtl/1.5.0-noundef-cxx |
329 |
+++ /dev/null |
330 |
@@ -1,11 +0,0 @@ |
331 |
---- configure |
332 |
-+++ configure |
333 |
-@@ -9995,7 +9997,7 @@ |
334 |
- if test "$aix_use_runtimelinking" = yes; then |
335 |
- # Warning - without using the other runtime loading flags (-brtl), |
336 |
- # -berok will link without error, but may produce a broken library. |
337 |
-- allow_undefined_flag_CXX='-berok' |
338 |
-+ no_undefined_flag_CXX=' ${wl}-bernotok' |
339 |
- # Determine the default libpath from the value encoded in an empty executable. |
340 |
- cat >conftest.$ac_ext <<_ACEOF |
341 |
- #line $LINENO "configure" |
342 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-soname b/eclass/ELT-patches/aixrtl/1.5.0-soname |
343 |
deleted file mode 100644 |
344 |
index 5c1806508c49..000000000000 |
345 |
--- a/eclass/ELT-patches/aixrtl/1.5.0-soname |
346 |
+++ /dev/null |
347 |
@@ -1,13 +0,0 @@ |
348 |
---- configure |
349 |
-+++ configure |
350 |
-@@ -14426,7 +14426,9 @@ |
351 |
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so |
352 |
- # instead of lib<name>.a to let people know that these are not |
353 |
- # typical AIX shared libraries. |
354 |
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
355 |
-+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' |
356 |
-+ [ "${OBJECT_MODE:-32}" = '64' ] && soname_spec='$libname$release$shared_ext$major(shr_64.o)' || soname_spec='$libname$release$shared_ext$major(shr.o)' |
357 |
-+ shlibpath_overrides_runpath=yes |
358 |
- else |
359 |
- # We preserve .a as extension for shared libraries through AIX4.2 |
360 |
- # and later when we are not doing run time linking. |
361 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-usertl-c b/eclass/ELT-patches/aixrtl/1.5.0-usertl-c |
362 |
deleted file mode 100644 |
363 |
index b5ff1866c895..000000000000 |
364 |
--- a/eclass/ELT-patches/aixrtl/1.5.0-usertl-c |
365 |
+++ /dev/null |
366 |
@@ -1,10 +0,0 @@ |
367 |
---- configure |
368 |
-+++ configure |
369 |
-@@ -7130,6 +7130,7 @@ |
370 |
- fi |
371 |
- done |
372 |
- esac |
373 |
-+ aix_use_runtimelinking=yes |
374 |
- |
375 |
- exp_sym_flag='-bexport' |
376 |
- no_entry_flag='-bnoentry' |
377 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.0-usertl-cxx b/eclass/ELT-patches/aixrtl/1.5.0-usertl-cxx |
378 |
deleted file mode 100644 |
379 |
index 36c84e9809b2..000000000000 |
380 |
--- a/eclass/ELT-patches/aixrtl/1.5.0-usertl-cxx |
381 |
+++ /dev/null |
382 |
@@ -1,10 +0,0 @@ |
383 |
---- configure |
384 |
-+++ configure |
385 |
-@@ -9936,6 +9937,7 @@ |
386 |
- esac |
387 |
- done |
388 |
- esac |
389 |
-+ aix_use_runtimelinking=yes |
390 |
- |
391 |
- exp_sym_flag='-bexport' |
392 |
- no_entry_flag='-bnoentry' |
393 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.22-cmds-c b/eclass/ELT-patches/aixrtl/1.5.22-cmds-c |
394 |
deleted file mode 100644 |
395 |
index a97485a3c127..000000000000 |
396 |
--- a/eclass/ELT-patches/aixrtl/1.5.22-cmds-c |
397 |
+++ /dev/null |
398 |
@@ -1,11 +0,0 @@ |
399 |
---- configure |
400 |
-+++ configure |
401 |
-@@ -8679,7 +8679,7 @@ |
402 |
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
403 |
- |
404 |
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
405 |
-- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
406 |
-+ archive_expsym_cmds='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~rm -f -r $lib.d' |
407 |
- else |
408 |
- if test "$host_cpu" = ia64; then |
409 |
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
410 |
diff --git a/eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx b/eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx |
411 |
deleted file mode 100644 |
412 |
index 222a0f716918..000000000000 |
413 |
--- a/eclass/ELT-patches/aixrtl/1.5.22-cmds-cxx |
414 |
+++ /dev/null |
415 |
@@ -1,11 +0,0 @@ |
416 |
---- configure |
417 |
-+++ configure |
418 |
-@@ -11731,7 +11731,7 @@ |
419 |
- |
420 |
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
421 |
- |
422 |
-- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
423 |
-+ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~rm -f -r $lib.d' |
424 |
- else |
425 |
- if test "$host_cpu" = ia64; then |
426 |
- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' |
427 |
diff --git a/eclass/ELT-patches/aixrtl/2.0.0-fpic-c b/eclass/ELT-patches/aixrtl/2.0.0-fpic-c |
428 |
deleted file mode 100644 |
429 |
index bb3cb42bbee3..000000000000 |
430 |
--- a/eclass/ELT-patches/aixrtl/2.0.0-fpic-c |
431 |
+++ /dev/null |
432 |
@@ -1,12 +0,0 @@ |
433 |
---- configure |
434 |
-+++ configure |
435 |
-@@ -1,6 +1,9 @@ |
436 |
- if test "$host_cpu" = ia64; then |
437 |
- # AIX 5 now supports IA64 processor |
438 |
- lt_prog_compiler_static='-Bstatic' |
439 |
-+ lt_prog_compiler_pic='-fPIC' |
440 |
-+ else |
441 |
-+ lt_prog_compiler_pic='-fPIC' |
442 |
- fi |
443 |
- ;; |
444 |
- |
445 |
diff --git a/eclass/ELT-patches/aixrtl/2.0.0-fpic-cxx b/eclass/ELT-patches/aixrtl/2.0.0-fpic-cxx |
446 |
deleted file mode 100644 |
447 |
index 532bbcf421e4..000000000000 |
448 |
--- a/eclass/ELT-patches/aixrtl/2.0.0-fpic-cxx |
449 |
+++ /dev/null |
450 |
@@ -1,12 +0,0 @@ |
451 |
---- configure |
452 |
-+++ configure |
453 |
-@@ -1,6 +1,9 @@ |
454 |
- if test "$host_cpu" = ia64; then |
455 |
- # AIX 5 now supports IA64 processor |
456 |
- lt_prog_compiler_static_CXX='-Bstatic' |
457 |
-+ lt_prog_compiler_pic_CXX='-fPIC' |
458 |
-+ else |
459 |
-+ lt_prog_compiler_pic_CXX='-fPIC' |
460 |
- fi |
461 |
- ;; |
462 |
- |
463 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-cmds-c b/eclass/ELT-patches/aixrtl/2.2.0-cmds-c |
464 |
deleted file mode 100644 |
465 |
index 6c2cd7ea5b57..000000000000 |
466 |
--- a/eclass/ELT-patches/aixrtl/2.2.0-cmds-c |
467 |
+++ /dev/null |
468 |
@@ -1,11 +0,0 @@ |
469 |
---- configure |
470 |
-+++ configure |
471 |
-@@ -8619,7 +8619,7 @@ |
472 |
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
473 |
- |
474 |
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
475 |
-- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
476 |
-+ archive_expsym_cmds='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~rm -f -r $lib.d' |
477 |
- else |
478 |
- if test "$host_cpu" = ia64; then |
479 |
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
480 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-cmds-cxx b/eclass/ELT-patches/aixrtl/2.2.0-cmds-cxx |
481 |
deleted file mode 100644 |
482 |
index af3c7b7c5a30..000000000000 |
483 |
--- a/eclass/ELT-patches/aixrtl/2.2.0-cmds-cxx |
484 |
+++ /dev/null |
485 |
@@ -1,11 +0,0 @@ |
486 |
---- configure |
487 |
-+++ configure |
488 |
-@@ -13946,7 +13947,7 @@ |
489 |
- |
490 |
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
491 |
- |
492 |
-- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
493 |
-+ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~rm -f -r $lib.d' |
494 |
- else |
495 |
- if test "$host_cpu" = ia64; then |
496 |
- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' |
497 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-expsym-c b/eclass/ELT-patches/aixrtl/2.2.0-expsym-c |
498 |
deleted file mode 100644 |
499 |
index 1f26cd2237eb..000000000000 |
500 |
--- a/eclass/ELT-patches/aixrtl/2.2.0-expsym-c |
501 |
+++ /dev/null |
502 |
@@ -1,16 +0,0 @@ |
503 |
---- configure |
504 |
-+++ configure |
505 |
-@@ -8475,9 +8475,11 @@ |
506 |
- # If we're using GNU nm, then we don't want the "-C" option. |
507 |
- # -C means demangle to AIX nm, but means don't demangle with GNU nm |
508 |
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
509 |
-- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
510 |
-+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
511 |
-+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
512 |
- else |
513 |
-- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
514 |
-+ export_symbols_cmds='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
515 |
-+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
516 |
- fi |
517 |
- aix_use_runtimelinking=no |
518 |
- |
519 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-expsym-cxx b/eclass/ELT-patches/aixrtl/2.2.0-expsym-cxx |
520 |
deleted file mode 100644 |
521 |
index b2164abe8fcf..000000000000 |
522 |
--- a/eclass/ELT-patches/aixrtl/2.2.0-expsym-cxx |
523 |
+++ /dev/null |
524 |
@@ -1,16 +0,0 @@ |
525 |
---- configure |
526 |
-+++ configure |
527 |
-@@ -15506,9 +15506,11 @@ |
528 |
- # If we're using GNU nm, then we don't want the "-C" option. |
529 |
- # -C means demangle to AIX nm, but means don't demangle with GNU nm |
530 |
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
531 |
-- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
532 |
-+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
533 |
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
534 |
- else |
535 |
-- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
536 |
-+ export_symbols_cmds_CXX='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
537 |
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
538 |
- fi |
539 |
- ;; |
540 |
- pw32*) |
541 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-noundef-c b/eclass/ELT-patches/aixrtl/2.2.0-noundef-c |
542 |
deleted file mode 100644 |
543 |
index d9520cbbd730..000000000000 |
544 |
--- a/eclass/ELT-patches/aixrtl/2.2.0-noundef-c |
545 |
+++ /dev/null |
546 |
@@ -1,11 +0,0 @@ |
547 |
---- configure |
548 |
-+++ configure |
549 |
-@@ -8558,7 +8558,7 @@ |
550 |
- if test "$aix_use_runtimelinking" = yes; then |
551 |
- # Warning - without using the other runtime loading flags (-brtl), |
552 |
- # -berok will link without error, but may produce a broken library. |
553 |
-- allow_undefined_flag='-berok' |
554 |
-+ no_undefined_flag=' ${wl}-bernotok' |
555 |
- # Determine the default libpath from the value encoded in an |
556 |
- # empty executable. |
557 |
- cat >conftest.$ac_ext <<_ACEOF |
558 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-noundef-cxx b/eclass/ELT-patches/aixrtl/2.2.0-noundef-cxx |
559 |
deleted file mode 100644 |
560 |
index 37d02dba8c6a..000000000000 |
561 |
--- a/eclass/ELT-patches/aixrtl/2.2.0-noundef-cxx |
562 |
+++ /dev/null |
563 |
@@ -1,11 +0,0 @@ |
564 |
---- configure |
565 |
-+++ configure |
566 |
-@@ -13884,7 +13885,7 @@ |
567 |
- if test "$aix_use_runtimelinking" = yes; then |
568 |
- # Warning - without using the other runtime loading flags (-brtl), |
569 |
- # -berok will link without error, but may produce a broken library. |
570 |
-- allow_undefined_flag_CXX='-berok' |
571 |
-+ no_undefined_flag_CXX=' ${wl}-bernotok' |
572 |
- # Determine the default libpath from the value encoded in an empty |
573 |
- # executable. |
574 |
- cat >conftest.$ac_ext <<_ACEOF |
575 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.0-usertl-cxx b/eclass/ELT-patches/aixrtl/2.2.0-usertl-cxx |
576 |
deleted file mode 100644 |
577 |
index c59a093c94fc..000000000000 |
578 |
--- a/eclass/ELT-patches/aixrtl/2.2.0-usertl-cxx |
579 |
+++ /dev/null |
580 |
@@ -1,10 +0,0 @@ |
581 |
---- configure |
582 |
-+++ configure |
583 |
-@@ -13819,6 +13819,7 @@ |
584 |
- done |
585 |
- ;; |
586 |
- esac |
587 |
-+ aix_use_runtimelinking=yes |
588 |
- |
589 |
- exp_sym_flag='-bexport' |
590 |
- no_entry_flag='-bnoentry' |
591 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.8-cmds-c b/eclass/ELT-patches/aixrtl/2.2.8-cmds-c |
592 |
deleted file mode 100644 |
593 |
index e1e09347b21f..000000000000 |
594 |
--- a/eclass/ELT-patches/aixrtl/2.2.8-cmds-c |
595 |
+++ /dev/null |
596 |
@@ -1,11 +0,0 @@ |
597 |
---- configure |
598 |
-+++ configure |
599 |
-@@ -9214,7 +9214,7 @@ |
600 |
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
601 |
- |
602 |
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
603 |
-- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
604 |
-+ archive_expsym_cmds='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~rm -f -r $lib.d' |
605 |
- else |
606 |
- if test "$host_cpu" = ia64; then |
607 |
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
608 |
diff --git a/eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx b/eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx |
609 |
deleted file mode 100644 |
610 |
index 7a31f661d44c..000000000000 |
611 |
--- a/eclass/ELT-patches/aixrtl/2.2.8-cmds-cxx |
612 |
+++ /dev/null |
613 |
@@ -1,11 +0,0 @@ |
614 |
---- configure |
615 |
-+++ configure |
616 |
-@@ -13307,7 +13307,7 @@ |
617 |
- |
618 |
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
619 |
- |
620 |
-- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
621 |
-+ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~rm -f -r $lib.d~mkdir -p $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~rm -f -r $lib.d' |
622 |
- else |
623 |
- if test "$host_cpu" = ia64; then |
624 |
- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' |
625 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.0-expsym-c b/eclass/ELT-patches/aixrtl/2.4.0-expsym-c |
626 |
deleted file mode 100644 |
627 |
index 5af84e7abfab..000000000000 |
628 |
--- a/eclass/ELT-patches/aixrtl/2.4.0-expsym-c |
629 |
+++ /dev/null |
630 |
@@ -1,16 +0,0 @@ |
631 |
---- configure |
632 |
-+++ configure |
633 |
-@@ -9660,9 +9660,11 @@ |
634 |
- # Also, AIX nm treats weak defined symbols like other global |
635 |
- # defined symbols, whereas GNU nm marks them as "W". |
636 |
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
637 |
-- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
638 |
-+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
639 |
-+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
640 |
- else |
641 |
-- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
642 |
-+ export_symbols_cmds='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
643 |
-+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
644 |
- fi |
645 |
- aix_use_runtimelinking=no |
646 |
- |
647 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.0-expsym-cxx b/eclass/ELT-patches/aixrtl/2.4.0-expsym-cxx |
648 |
deleted file mode 100644 |
649 |
index 0bb3729a1b36..000000000000 |
650 |
--- a/eclass/ELT-patches/aixrtl/2.4.0-expsym-cxx |
651 |
+++ /dev/null |
652 |
@@ -1,16 +0,0 @@ |
653 |
---- configure |
654 |
-+++ configure |
655 |
-@@ -15711,9 +15711,11 @@ |
656 |
- # Also, AIX nm treats weak defined symbols like other global defined |
657 |
- # symbols, whereas GNU nm marks them as "W". |
658 |
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
659 |
-- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
660 |
-+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' |
661 |
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
662 |
- else |
663 |
-- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
664 |
-+ export_symbols_cmds_CXX='`echo $NM | sed -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' |
665 |
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
666 |
- fi |
667 |
- ;; |
668 |
- pw32*) |
669 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c |
670 |
deleted file mode 100644 |
671 |
index d92ce344b4f1..000000000000 |
672 |
--- a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-c |
673 |
+++ /dev/null |
674 |
@@ -1,11 +0,0 @@ |
675 |
---- configure |
676 |
-+++ configure |
677 |
-@@ -9214,7 +9214,7 @@ |
678 |
- fi |
679 |
- |
680 |
- hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" |
681 |
-- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag |
682 |
-+ archive_expsym_cmds='eval `echo "$soname" | $SED -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~$RM -r $lib.d~$MKDIR $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~$RM -r $lib.d' |
683 |
- else |
684 |
- if test ia64 = "$host_cpu"; then |
685 |
- hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' |
686 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx b/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx |
687 |
deleted file mode 100644 |
688 |
index 851be2763982..000000000000 |
689 |
--- a/eclass/ELT-patches/aixrtl/2.4.2.418-cmds-cxx |
690 |
+++ /dev/null |
691 |
@@ -1,11 +0,0 @@ |
692 |
---- configure |
693 |
-+++ configure |
694 |
-@@ -13307,7 +13307,7 @@ |
695 |
- |
696 |
- hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath" |
697 |
- |
698 |
-- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag |
699 |
-+ archive_expsym_cmds_CXX='eval `echo "$soname" | sed -e "s,^,: ,; s,(,; membnam=,; s,\.o),,"`~$RM -r $lib.d~$MKDIR $lib.d~$CC -o $lib.d/$membnam.o $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags -shared $wl-G$allow_undefined_flag $wl'$exp_sym_flag':$export_symbols~$STRIP -e $lib.d/$membnam.o~( echo "#! $soname"; if test $membnam = shr_64; then echo "# 64"; else echo "# 32"; fi; cat $export_symbols ) > $lib.d/$membnam.imp~$AR $AR_FLAGS $lib $lib.d/$membnam.o $lib.d/$membnam.imp~$RM -r $lib.d' |
700 |
- else |
701 |
- if test ia64 = "$host_cpu"; then |
702 |
- hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib' |
703 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.2.418-soname b/eclass/ELT-patches/aixrtl/2.4.2.418-soname |
704 |
deleted file mode 100644 |
705 |
index cb9e48fc0e89..000000000000 |
706 |
--- a/eclass/ELT-patches/aixrtl/2.4.2.418-soname |
707 |
+++ /dev/null |
708 |
@@ -1,12 +0,0 @@ |
709 |
---- configure |
710 |
-+++ configure |
711 |
-@@ -14426,6 +14426,8 @@ |
712 |
- # instead of lib<name>.a to let people know that these are not |
713 |
- # typical AIX shared libraries. |
714 |
-- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' |
715 |
-+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' |
716 |
-+ [ "${OBJECT_MODE:-32}" = '64' ] && soname_spec='$libname$release$shared_ext$major(shr_64.o)' || soname_spec='$libname$release$shared_ext$major(shr.o)' |
717 |
-+ shlibpath_overrides_runpath=yes |
718 |
- else |
719 |
- # We preserve .a as extension for shared libraries through AIX4.2 |
720 |
- # and later when we are not doing run time linking. |
721 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.4-expsym-c b/eclass/ELT-patches/aixrtl/2.4.4-expsym-c |
722 |
deleted file mode 100644 |
723 |
index cad960b04adc..000000000000 |
724 |
--- a/eclass/ELT-patches/aixrtl/2.4.4-expsym-c |
725 |
+++ /dev/null |
726 |
@@ -1,21 +0,0 @@ |
727 |
-commit 2dfd834840a9de8ce3866af1cf8f3aff9b1a15e8 |
728 |
-Author: Michael Haubenwallner <michael.haubenwallner@××××××××××××.com> |
729 |
-Date: Wed Mar 2 15:06:48 2016 +0100 |
730 |
- |
731 |
- AIX: Stop exporting any _GLOBAL__ symbol. |
732 |
- |
733 |
- * m4/libtool.m4 (_LT_LINKER_SHLIBS): On AIX, GNU g++ generates |
734 |
- _GLOBAL__* symbols as, amongst others, landing pads for C++ exceptions. |
735 |
- These symbols must not be exported from shared libraries, or exception |
736 |
- handling may break for applications with runtime linking enabled. |
737 |
- |
738 |
---- configure |
739 |
-+++ configure |
740 |
-@@ -5446,6 +5447,7 @@ _LT_EOF |
741 |
- # symbols only, and the '-p' flag disables sorting to improve |
742 |
- # performance. For the weak symbol handling see the CXX tag. |
743 |
- export_symbols_cmds='$NM -gp $libobjs $convenience | $global_symbol_pipe | $EGREP -v " ($exclude_expsyms)$" | awk '\''{ kw = "" } /^([[CVWZ]]|[[BDLT]]\*) / { kw = " weak" } { print $ 3 kw }'\'' | sort -u > $export_symbols' |
744 |
-+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
745 |
- aix_use_runtimelinking=no |
746 |
- |
747 |
- # Test if we are trying to use run time linking or normal |
748 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.4-expsym-cxx b/eclass/ELT-patches/aixrtl/2.4.4-expsym-cxx |
749 |
deleted file mode 100644 |
750 |
index a9ea0467a5aa..000000000000 |
751 |
--- a/eclass/ELT-patches/aixrtl/2.4.4-expsym-cxx |
752 |
+++ /dev/null |
753 |
@@ -1,21 +0,0 @@ |
754 |
-commit 2dfd834840a9de8ce3866af1cf8f3aff9b1a15e8 |
755 |
-Author: Michael Haubenwallner <michael.haubenwallner@××××××××××××.com> |
756 |
-Date: Wed Mar 2 15:06:48 2016 +0100 |
757 |
- |
758 |
- AIX: Stop exporting any _GLOBAL__ symbol. |
759 |
- |
760 |
- * m4/libtool.m4 (_LT_LINKER_SHLIBS): On AIX, GNU g++ generates |
761 |
- _GLOBAL__* symbols as, amongst others, landing pads for C++ exceptions. |
762 |
- These symbols must not be exported from shared libraries, or exception |
763 |
- handling may break for applications with runtime linking enabled. |
764 |
- |
765 |
---- configure |
766 |
-+++ configure |
767 |
-@@ -5000,6 +5000,7 @@ m4_if([$1], [CXX], [ |
768 |
- # '[[BDLT]]*' with AIX nm in default mode (POSIX like) |
769 |
- # '[[CVW]]' with GNU nm in either BSD or POSIX mode |
770 |
- export_symbols_cmds_CXX='$NM -gp $libobjs $convenience | $global_symbol_pipe | $EGREP -v " ($exclude_expsyms)$" | awk '\''{ kw = "" } /^([[CVWZ]]|[[BDLT]]\*) / { kw = " weak" } { print $ 3 kw }'\'' | sort -u > $export_symbols' |
771 |
-+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*|_GLOBAL__[FID]_.*' |
772 |
- ;; |
773 |
- pw32*) |
774 |
- export_symbols_cmds_CXX=$ltdll_cmds |
775 |
diff --git a/eclass/ELT-patches/aixrtl/2.4.4-with-svr4 b/eclass/ELT-patches/aixrtl/2.4.4-with-svr4 |
776 |
deleted file mode 100644 |
777 |
index f356ea9883a9..000000000000 |
778 |
--- a/eclass/ELT-patches/aixrtl/2.4.4-with-svr4 |
779 |
+++ /dev/null |
780 |
@@ -1,11 +0,0 @@ |
781 |
---- configure |
782 |
-+++ configure |
783 |
-@@ -10835,7 +10835,7 @@ |
784 |
- if ${lt_cv_with_aix_soname+:} false; then : |
785 |
- $as_echo_n "(cached) " >&6 |
786 |
- else |
787 |
-- lt_cv_with_aix_soname=aix |
788 |
-+ lt_cv_with_aix_soname=svr4 |
789 |
- fi |
790 |
- |
791 |
- with_aix_soname=$lt_cv_with_aix_soname |
792 |
diff --git a/eclass/ELT-patches/as-needed/1.5 b/eclass/ELT-patches/as-needed/1.5 |
793 |
deleted file mode 100644 |
794 |
index 01759c93f903..000000000000 |
795 |
--- a/eclass/ELT-patches/as-needed/1.5 |
796 |
+++ /dev/null |
797 |
@@ -1,30 +0,0 @@ |
798 |
---- ltmain.sh.orig 2006-03-29 15:45:36.000000000 +0200 |
799 |
-+++ ltmain.sh 2006-03-29 16:39:30.000000000 +0200 |
800 |
-@@ -1754,6 +1754,11 @@ |
801 |
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"` |
802 |
- ;; |
803 |
- |
804 |
-+ -Wl,--as-needed|-Wl,--no-as-needed) |
805 |
-+ deplibs="$deplibs $arg" |
806 |
-+ continue |
807 |
-+ ;; |
808 |
-+ |
809 |
- -Wl,*) |
810 |
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` |
811 |
- arg= |
812 |
-@@ -2094,6 +2099,15 @@ |
813 |
- lib= |
814 |
- found=no |
815 |
- case $deplib in |
816 |
-+ -Wl,--as-needed|-Wl,--no-as-needed) |
817 |
-+ if test "$linkmode,$pass" = "prog,link"; then |
818 |
-+ compile_deplibs="$deplib $compile_deplibs" |
819 |
-+ finalize_deplibs="$deplib $finalize_deplibs" |
820 |
-+ else |
821 |
-+ deplibs="$deplib $deplibs" |
822 |
-+ fi |
823 |
-+ continue |
824 |
-+ ;; |
825 |
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) |
826 |
- if test "$linkmode,$pass" = "prog,link"; then |
827 |
- compile_deplibs="$deplib $compile_deplibs" |
828 |
diff --git a/eclass/ELT-patches/as-needed/1.5.26 b/eclass/ELT-patches/as-needed/1.5.26 |
829 |
deleted file mode 100644 |
830 |
index 6836c55e1433..000000000000 |
831 |
--- a/eclass/ELT-patches/as-needed/1.5.26 |
832 |
+++ /dev/null |
833 |
@@ -1,38 +0,0 @@ |
834 |
---- ltmain.sh.orig 2009-04-18 16:51:52.000000000 +0200 |
835 |
-+++ ltmain.sh 2009-04-18 16:55:05.000000000 +0200 |
836 |
-@@ -1812,10 +1812,15 @@ |
837 |
- done |
838 |
- IFS="$save_ifs" |
839 |
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"` |
840 |
- ;; |
841 |
- |
842 |
-+ -Wl,--as-needed|-Wl,--no-as-needed) |
843 |
-+ deplibs="$deplibs $arg" |
844 |
-+ continue |
845 |
-+ ;; |
846 |
-+ |
847 |
- -Wl,*) |
848 |
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` |
849 |
- arg= |
850 |
- save_ifs="$IFS"; IFS=',' |
851 |
- for flag in $args; do |
852 |
-@@ -2152,10 +2157,19 @@ |
853 |
- fi |
854 |
- for deplib in $libs; do |
855 |
- lib= |
856 |
- found=no |
857 |
- case $deplib in |
858 |
-+ -Wl,--as-needed|-Wl,--no-as-needed) |
859 |
-+ if test "$linkmode,$pass" = "prog,link"; then |
860 |
-+ compile_deplibs="$deplib $compile_deplibs" |
861 |
-+ finalize_deplibs="$deplib $finalize_deplibs" |
862 |
-+ else |
863 |
-+ deplibs="$deplib $deplibs" |
864 |
-+ fi |
865 |
-+ continue |
866 |
-+ ;; |
867 |
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
868 |
- if test "$linkmode,$pass" = "prog,link"; then |
869 |
- compile_deplibs="$deplib $compile_deplibs" |
870 |
- finalize_deplibs="$deplib $finalize_deplibs" |
871 |
- else |
872 |
diff --git a/eclass/ELT-patches/as-needed/2.2.6 b/eclass/ELT-patches/as-needed/2.2.6 |
873 |
deleted file mode 100644 |
874 |
index 7e71de4618dc..000000000000 |
875 |
--- a/eclass/ELT-patches/as-needed/2.2.6 |
876 |
+++ /dev/null |
877 |
@@ -1,38 +0,0 @@ |
878 |
---- ltmain.sh.orig 2009-04-18 14:37:16.000000000 +0200 |
879 |
-+++ ltmain.sh 2009-04-18 14:40:08.000000000 +0200 |
880 |
-@@ -4721,10 +4721,15 @@ |
881 |
- IFS="$save_ifs" |
882 |
- func_stripname ' ' '' "$arg" |
883 |
- arg=$func_stripname_result |
884 |
- ;; |
885 |
- |
886 |
-+ -Wl,--as-needed|-Wl,--no-as-needed) |
887 |
-+ deplibs="$deplibs $arg" |
888 |
-+ continue |
889 |
-+ ;; |
890 |
-+ |
891 |
- -Wl,*) |
892 |
- func_stripname '-Wl,' '' "$arg" |
893 |
- args=$func_stripname_result |
894 |
- arg= |
895 |
- save_ifs="$IFS"; IFS=',' |
896 |
-@@ -5075,10 +5080,19 @@ |
897 |
- |
898 |
- for deplib in $libs; do |
899 |
- lib= |
900 |
- found=no |
901 |
- case $deplib in |
902 |
-+ -Wl,--as-needed|-Wl,--no-as-needed) |
903 |
-+ if test "$linkmode,$pass" = "prog,link"; then |
904 |
-+ compile_deplibs="$deplib $compile_deplibs" |
905 |
-+ finalize_deplibs="$deplib $finalize_deplibs" |
906 |
-+ else |
907 |
-+ deplibs="$deplib $deplibs" |
908 |
-+ fi |
909 |
-+ continue |
910 |
-+ ;; |
911 |
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
912 |
- if test "$linkmode,$pass" = "prog,link"; then |
913 |
- compile_deplibs="$deplib $compile_deplibs" |
914 |
- finalize_deplibs="$deplib $finalize_deplibs" |
915 |
- else |
916 |
diff --git a/eclass/ELT-patches/as-needed/2.4.2 b/eclass/ELT-patches/as-needed/2.4.2 |
917 |
deleted file mode 100644 |
918 |
index 526877a6d35b..000000000000 |
919 |
--- a/eclass/ELT-patches/as-needed/2.4.2 |
920 |
+++ /dev/null |
921 |
@@ -1,38 +0,0 @@ |
922 |
---- ltmain.sh.orig 2012-08-19 10:18:57.929178597 +0200 |
923 |
-+++ ltmain.sh 2012-08-19 10:31:43.409388998 +0200 |
924 |
-@@ -5798,10 +5798,15 @@ |
925 |
- IFS="$save_ifs" |
926 |
- func_stripname ' ' '' "$arg" |
927 |
- arg=$func_stripname_result |
928 |
- ;; |
929 |
- |
930 |
-+ -Wl,--as-needed|-Wl,--no-as-needed) |
931 |
-+ deplibs="$deplibs $arg" |
932 |
-+ continue |
933 |
-+ ;; |
934 |
-+ |
935 |
- -Wl,*) |
936 |
- func_stripname '-Wl,' '' "$arg" |
937 |
- args=$func_stripname_result |
938 |
- arg= |
939 |
- save_ifs="$IFS"; IFS=',' |
940 |
-@@ -6158,10 +6163,19 @@ |
941 |
- |
942 |
- for deplib in $libs; do |
943 |
- lib= |
944 |
- found=no |
945 |
- case $deplib in |
946 |
-+ -Wl,--as-needed|-Wl,--no-as-needed) |
947 |
-+ if test "$linkmode,$pass" = "prog,link"; then |
948 |
-+ compile_deplibs="$deplib $compile_deplibs" |
949 |
-+ finalize_deplibs="$deplib $finalize_deplibs" |
950 |
-+ else |
951 |
-+ deplibs="$deplib $deplibs" |
952 |
-+ fi |
953 |
-+ continue |
954 |
-+ ;; |
955 |
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
956 |
- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
957 |
- if test "$linkmode,$pass" = "prog,link"; then |
958 |
- compile_deplibs="$deplib $compile_deplibs" |
959 |
- finalize_deplibs="$deplib $finalize_deplibs" |
960 |
diff --git a/eclass/ELT-patches/as-needed/2.4.3 b/eclass/ELT-patches/as-needed/2.4.3 |
961 |
deleted file mode 100644 |
962 |
index a31e9edab039..000000000000 |
963 |
--- a/eclass/ELT-patches/as-needed/2.4.3 |
964 |
+++ /dev/null |
965 |
@@ -1,38 +0,0 @@ |
966 |
---- ltmain.sh |
967 |
-+++ ltmain.sh |
968 |
-@@ -7225,10 +7225,15 @@ |
969 |
- IFS=$save_ifs |
970 |
- func_stripname ' ' '' "$arg" |
971 |
- arg=$func_stripname_result |
972 |
- ;; |
973 |
- |
974 |
-+ -Wl,--as-needed|-Wl,--no-as-needed) |
975 |
-+ deplibs="$deplibs $arg" |
976 |
-+ continue |
977 |
-+ ;; |
978 |
-+ |
979 |
- -Wl,*) |
980 |
- func_stripname '-Wl,' '' "$arg" |
981 |
- args=$func_stripname_result |
982 |
- arg= |
983 |
- save_ifs=$IFS; IFS=, |
984 |
-@@ -7609,10 +7614,19 @@ |
985 |
- |
986 |
- for deplib in $libs; do |
987 |
- lib= |
988 |
- found=false |
989 |
- case $deplib in |
990 |
-+ -Wl,--as-needed|-Wl,--no-as-needed) |
991 |
-+ if test "$linkmode,$pass" = "prog,link"; then |
992 |
-+ compile_deplibs="$deplib $compile_deplibs" |
993 |
-+ finalize_deplibs="$deplib $finalize_deplibs" |
994 |
-+ else |
995 |
-+ deplibs="$deplib $deplibs" |
996 |
-+ fi |
997 |
-+ continue |
998 |
-+ ;; |
999 |
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
1000 |
- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
1001 |
- if test prog,link = "$linkmode,$pass"; then |
1002 |
- compile_deplibs="$deplib $compile_deplibs" |
1003 |
- finalize_deplibs="$deplib $finalize_deplibs" |
1004 |
diff --git a/eclass/ELT-patches/cross/2.2 b/eclass/ELT-patches/cross/2.2 |
1005 |
deleted file mode 100644 |
1006 |
index e8fc2be5210a..000000000000 |
1007 |
--- a/eclass/ELT-patches/cross/2.2 |
1008 |
+++ /dev/null |
1009 |
@@ -1,20 +0,0 @@ |
1010 |
---- ltmain.sh |
1011 |
-+++ ltmain.sh |
1012 |
-@@ -5768,7 +5768,7 @@ |
1013 |
- test "$hardcode_direct_absolute" = no; then |
1014 |
- add="$libdir/$linklib" |
1015 |
- elif test "$hardcode_minus_L" = yes; then |
1016 |
-- add_dir="-L$libdir" |
1017 |
-+ add_dir="-L${SYSROOT}$libdir" |
1018 |
- add="-l$name" |
1019 |
- elif test "$hardcode_shlibpath_var" = yes; then |
1020 |
- case :$finalize_shlibpath: in |
1021 |
-@@ -5785,7 +5785,7 @@ |
1022 |
- fi |
1023 |
- else |
1024 |
- # We cannot seem to hardcode it, guess we'll fake it. |
1025 |
-- add_dir="-L$libdir" |
1026 |
-+ add_dir="-L${SYSROOT}/$libdir" |
1027 |
- # Try looking first in the location we're being installed to. |
1028 |
- if test -n "$inst_prefix_dir"; then |
1029 |
- case $libdir in |
1030 |
diff --git a/eclass/ELT-patches/cross/2.4 b/eclass/ELT-patches/cross/2.4 |
1031 |
deleted file mode 100644 |
1032 |
index 9b3529559179..000000000000 |
1033 |
--- a/eclass/ELT-patches/cross/2.4 |
1034 |
+++ /dev/null |
1035 |
@@ -1,20 +0,0 @@ |
1036 |
---- ltmain.sh |
1037 |
-+++ ltmain.sh |
1038 |
-@@ -5768,7 +5768,7 @@ |
1039 |
- test "$hardcode_direct_absolute" = no; then |
1040 |
- add="$libdir/$linklib" |
1041 |
- elif test "$hardcode_minus_L" = yes; then |
1042 |
-- add_dir="-L$libdir" |
1043 |
-+ add_dir="-L${lt_sysroot:-${SYSROOT}}$libdir" |
1044 |
- add="-l$name" |
1045 |
- elif test "$hardcode_shlibpath_var" = yes; then |
1046 |
- case :$finalize_shlibpath: in |
1047 |
-@@ -5785,7 +5785,7 @@ |
1048 |
- fi |
1049 |
- else |
1050 |
- # We cannot seem to hardcode it, guess we'll fake it. |
1051 |
-- add_dir="-L$libdir" |
1052 |
-+ add_dir="-L${lt_sysroot:-${SYSROOT}}/$libdir" |
1053 |
- # Try looking first in the location we're being installed to. |
1054 |
- if test -n "$inst_prefix_dir"; then |
1055 |
- case $libdir in |
1056 |
diff --git a/eclass/ELT-patches/cross/2.4.3 b/eclass/ELT-patches/cross/2.4.3 |
1057 |
deleted file mode 100644 |
1058 |
index 760104fc894e..000000000000 |
1059 |
--- a/eclass/ELT-patches/cross/2.4.3 |
1060 |
+++ /dev/null |
1061 |
@@ -1,21 +0,0 @@ |
1062 |
---- ltmain.sh |
1063 |
-+++ ltmain.sh |
1064 |
-@@ -8367,7 +8367,7 @@ |
1065 |
- test no = "$hardcode_direct_absolute"; then |
1066 |
- add=$libdir/$linklib |
1067 |
- elif test yes = "$hardcode_minus_L"; then |
1068 |
-- add_dir=-L$libdir |
1069 |
-+ add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir |
1070 |
- add=-l$name |
1071 |
- elif test yes = "$hardcode_shlibpath_var"; then |
1072 |
- case :$finalize_shlibpath: in |
1073 |
-@@ -8384,7 +8384,7 @@ |
1074 |
- fi |
1075 |
- else |
1076 |
- # We cannot seem to hardcode it, guess we'll fake it. |
1077 |
-- add_dir=-L$libdir |
1078 |
-+ add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir |
1079 |
- # Try looking first in the location we're being installed to. |
1080 |
- if test -n "$inst_prefix_dir"; then |
1081 |
- case $libdir in |
1082 |
- |
1083 |
diff --git a/eclass/ELT-patches/darwin-conf/1.5 b/eclass/ELT-patches/darwin-conf/1.5 |
1084 |
deleted file mode 100644 |
1085 |
index 46d9e5a885e8..000000000000 |
1086 |
--- a/eclass/ELT-patches/darwin-conf/1.5 |
1087 |
+++ /dev/null |
1088 |
@@ -1,24 +0,0 @@ |
1089 |
-In Gentoo Prefix we go by Apple's convention to give modules the .bundle |
1090 |
-extension. |
1091 |
-http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html |
1092 |
-(Above link was removed by Apple, the link below contains a copy: |
1093 |
-http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, |
1094 |
-in case it disappears also, the relevant quote: |
1095 |
- |
1096 |
-Bundle. Bundles are executable files that can be loaded at runtime by |
1097 |
-other products. Plug-ins are implemented using bundles. The term bundle |
1098 |
-in this context refers to the binary itself, not to a structured |
1099 |
-hierarchy. Bundles have the .bundle extension; for example, |
1100 |
-MyBundle.bundle.) |
1101 |
- |
1102 |
---- configure.orig 2009-05-22 12:05:31 +0200 |
1103 |
-+++ configure 2009-05-22 12:05:39 +0200 |
1104 |
-@@ -15461,7 +15461,7 @@ |
1105 |
- soname_spec='${libname}${release}${major}$shared_ext' |
1106 |
- shlibpath_overrides_runpath=yes |
1107 |
- shlibpath_var=DYLD_LIBRARY_PATH |
1108 |
-- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
1109 |
-+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
1110 |
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
1111 |
- if test "$GCC" = yes; then |
1112 |
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
1113 |
diff --git a/eclass/ELT-patches/darwin-conf/1.5b b/eclass/ELT-patches/darwin-conf/1.5b |
1114 |
deleted file mode 100644 |
1115 |
index 65633a818419..000000000000 |
1116 |
--- a/eclass/ELT-patches/darwin-conf/1.5b |
1117 |
+++ /dev/null |
1118 |
@@ -1,33 +0,0 @@ |
1119 |
-In Gentoo Prefix we go by Apple's convention to give modules the .bundle |
1120 |
-extension. |
1121 |
-http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html |
1122 |
-(Above link was removed by Apple, the link below contains a copy: |
1123 |
-http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, |
1124 |
-in case it disappears also, the relevant quote: |
1125 |
- |
1126 |
-Bundle. Bundles are executable files that can be loaded at runtime by |
1127 |
-other products. Plug-ins are implemented using bundles. The term bundle |
1128 |
-in this context refers to the binary itself, not to a structured |
1129 |
-hierarchy. Bundles have the .bundle extension; for example, |
1130 |
-MyBundle.bundle.) |
1131 |
- |
1132 |
---- configure |
1133 |
-+++ configure |
1134 |
-@@ -10570,7 +10570,7 @@ |
1135 |
- soname_spec='${libname}${release}${major}$shared_ext' |
1136 |
- shlibpath_overrides_runpath=yes |
1137 |
- shlibpath_var=DYLD_LIBRARY_PATH |
1138 |
-- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
1139 |
-+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
1140 |
- |
1141 |
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" |
1142 |
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
1143 |
-@@ -14213,7 +14213,7 @@ |
1144 |
- soname_spec='${libname}${release}${major}$shared_ext' |
1145 |
- shlibpath_overrides_runpath=yes |
1146 |
- shlibpath_var=DYLD_LIBRARY_PATH |
1147 |
-- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
1148 |
-+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
1149 |
- |
1150 |
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
1151 |
- ;; |
1152 |
diff --git a/eclass/ELT-patches/darwin-conf/2.2.4 b/eclass/ELT-patches/darwin-conf/2.2.4 |
1153 |
deleted file mode 100644 |
1154 |
index 5ad829343f7d..000000000000 |
1155 |
--- a/eclass/ELT-patches/darwin-conf/2.2.4 |
1156 |
+++ /dev/null |
1157 |
@@ -1,29 +0,0 @@ |
1158 |
-In Gentoo Prefix we go by Apple's convention to give modules the .bundle |
1159 |
-extension. |
1160 |
-http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html |
1161 |
-(Above link was removed by Apple, the link below contains a copy: |
1162 |
-http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, |
1163 |
-in case it disappears also, the relevant quote: |
1164 |
- |
1165 |
-Bundle. Bundles are executable files that can be loaded at runtime by |
1166 |
-other products. Plug-ins are implemented using bundles. The term bundle |
1167 |
-in this context refers to the binary itself, not to a structured |
1168 |
-hierarchy. Bundles have the .bundle extension; for example, |
1169 |
-MyBundle.bundle.) |
1170 |
- |
1171 |
---- configure |
1172 |
-+++ configure |
1173 |
-@@ -12172,11 +12172,11 @@ |
1174 |
- version_type=darwin |
1175 |
- need_lib_prefix=no |
1176 |
- need_version=no |
1177 |
-- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
1178 |
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
1179 |
- soname_spec='${libname}${release}${major}$shared_ext' |
1180 |
- shlibpath_overrides_runpath=yes |
1181 |
- shlibpath_var=DYLD_LIBRARY_PATH |
1182 |
-- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
1183 |
-+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
1184 |
- |
1185 |
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" |
1186 |
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
1187 |
diff --git a/eclass/ELT-patches/darwin-conf/2.2.6 b/eclass/ELT-patches/darwin-conf/2.2.6 |
1188 |
deleted file mode 100644 |
1189 |
index 669a68d09a10..000000000000 |
1190 |
--- a/eclass/ELT-patches/darwin-conf/2.2.6 |
1191 |
+++ /dev/null |
1192 |
@@ -1,43 +0,0 @@ |
1193 |
-In Gentoo Prefix we go by Apple's convention to give modules the .bundle |
1194 |
-extension. |
1195 |
-http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html |
1196 |
-(Above link was removed by Apple, the link below contains a copy: |
1197 |
-http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, |
1198 |
-in case it disappears also, the relevant quote: |
1199 |
- |
1200 |
-Bundle. Bundles are executable files that can be loaded at runtime by |
1201 |
-other products. Plug-ins are implemented using bundles. The term bundle |
1202 |
-in this context refers to the binary itself, not to a structured |
1203 |
-hierarchy. Bundles have the .bundle extension; for example, |
1204 |
-MyBundle.bundle.) |
1205 |
- |
1206 |
---- configure |
1207 |
-+++ configure |
1208 |
-@@ -11455,11 +11455,11 @@ |
1209 |
- version_type=darwin |
1210 |
- need_lib_prefix=no |
1211 |
- need_version=no |
1212 |
-- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
1213 |
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
1214 |
- soname_spec='${libname}${release}${major}$shared_ext' |
1215 |
- shlibpath_overrides_runpath=yes |
1216 |
- shlibpath_var=DYLD_LIBRARY_PATH |
1217 |
-- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
1218 |
-+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
1219 |
- |
1220 |
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" |
1221 |
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
1222 |
-@@ -15321,11 +15331,11 @@ |
1223 |
- version_type=darwin |
1224 |
- need_lib_prefix=no |
1225 |
- need_version=no |
1226 |
-- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
1227 |
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
1228 |
- soname_spec='${libname}${release}${major}$shared_ext' |
1229 |
- shlibpath_overrides_runpath=yes |
1230 |
- shlibpath_var=DYLD_LIBRARY_PATH |
1231 |
-- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
1232 |
-+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
1233 |
- |
1234 |
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
1235 |
- ;; |
1236 |
diff --git a/eclass/ELT-patches/darwin-conf/2.4.6 b/eclass/ELT-patches/darwin-conf/2.4.6 |
1237 |
deleted file mode 100644 |
1238 |
index a67ba12ebebe..000000000000 |
1239 |
--- a/eclass/ELT-patches/darwin-conf/2.4.6 |
1240 |
+++ /dev/null |
1241 |
@@ -1,29 +0,0 @@ |
1242 |
-In Gentoo Prefix we go by Apple's convention to give modules the .bundle |
1243 |
-extension. |
1244 |
-http://developer.apple.com/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html |
1245 |
-(Above link was removed by Apple, the link below contains a copy: |
1246 |
-http://disanji.net/iOS_Doc/#documentation/DeveloperTools/Conceptual/XcodeBuildSystem/500-Linking/bs_linking.html, |
1247 |
-in case it disappears also, the relevant quote: |
1248 |
- |
1249 |
-Bundle. Bundles are executable files that can be loaded at runtime by |
1250 |
-other products. Plug-ins are implemented using bundles. The term bundle |
1251 |
-in this context refers to the binary itself, not to a structured |
1252 |
-hierarchy. Bundles have the .bundle extension; for example, |
1253 |
-MyBundle.bundle.) |
1254 |
- |
1255 |
---- configure |
1256 |
-+++ configure |
1257 |
-@@ -13108,11 +13108,11 @@ |
1258 |
- version_type=darwin |
1259 |
- need_lib_prefix=no |
1260 |
- need_version=no |
1261 |
-- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' |
1262 |
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext $libname$release$major$shared_ext $libname$shared_ext' |
1263 |
- soname_spec='$libname$release$major$shared_ext' |
1264 |
- shlibpath_overrides_runpath=yes |
1265 |
- shlibpath_var=DYLD_LIBRARY_PATH |
1266 |
-- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
1267 |
-+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' |
1268 |
- |
1269 |
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" |
1270 |
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
1271 |
diff --git a/eclass/ELT-patches/darwin-ltconf/1.2.0 b/eclass/ELT-patches/darwin-ltconf/1.2.0 |
1272 |
deleted file mode 100644 |
1273 |
index da9f7e484db5..000000000000 |
1274 |
--- a/eclass/ELT-patches/darwin-ltconf/1.2.0 |
1275 |
+++ /dev/null |
1276 |
@@ -1,66 +0,0 @@ |
1277 |
---- ltconfig-1.2 Wed May 19 09:17:36 1999 |
1278 |
-+++ ltconfig Wed Oct 6 14:29:08 2004 |
1279 |
-@@ -459,6 +459,11 @@ |
1280 |
- os2*) |
1281 |
- # We can build DLLs from non-PIC. |
1282 |
- ;; |
1283 |
-+ darwin* | rhapsody*) |
1284 |
-+ # PIC is the default on this platform |
1285 |
-+ # Common symbols not allowed in MH_DYLIB files |
1286 |
-+ pic_flag='-fno-common' |
1287 |
-+ ;; |
1288 |
- amigaos*) |
1289 |
- # FIXME: we need at least 68020 code to build shared libraries, but |
1290 |
- # adding the `-m68020' flag to GCC prevents building anything better, |
1291 |
-@@ -785,6 +790,23 @@ |
1292 |
- hardcode_shlibpath_var=no |
1293 |
- ;; |
1294 |
- |
1295 |
-+ darwin* | rhapsody*) |
1296 |
-+ case "$host_os" in |
1297 |
-+ rhapsody* | darwin1.[012]) |
1298 |
-+ allow_undefined_flag='-undefined suppress' |
1299 |
-+ ;; |
1300 |
-+ *) # Darwin 1.3 on |
1301 |
-+ allow_undefined_flag='-flat_namespace -undefined suppress' |
1302 |
-+ ;; |
1303 |
-+ esac |
1304 |
-+ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' |
1305 |
-+ # We need to add '_' to the symbols in $export_symbols first |
1306 |
-+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' |
1307 |
-+ hardcode_direct=yes |
1308 |
-+ hardcode_shlibpath_var=no |
1309 |
-+ whole_archive_flag_spec='-all_load $convenience' |
1310 |
-+ ;; |
1311 |
-+ |
1312 |
- hpux9*) |
1313 |
- archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs;mv $objdir/$soname $lib' |
1314 |
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
1315 |
-@@ -1134,6 +1156,27 @@ |
1316 |
- version_type=sunos |
1317 |
- library_names_spec='${libname}${release}.so.$versuffix' |
1318 |
- shlibpath_var=LD_LIBRARY_PATH |
1319 |
-+ ;; |
1320 |
-+ |
1321 |
-+darwin* | rhapsody*) |
1322 |
-+ dynamic_linker="$host_os dyld" |
1323 |
-+ version_type=darwin |
1324 |
-+ need_lib_prefix=no |
1325 |
-+ need_version=no |
1326 |
-+ deplibs_check_method='file_magic Mach-O dynamically linked shared library' |
1327 |
-+ file_magic_cmd='/usr/bin/file -L' |
1328 |
-+ case "$host_os" in |
1329 |
-+ rhapsody* | darwin1.[012]) |
1330 |
-+ file_magic_test_file='/System/Library/Frameworks/System.framework/System' |
1331 |
-+ ;; |
1332 |
-+ *) # Darwin 1.3 on |
1333 |
-+ file_magic_test_file='/usr/lib/libSystem.dylib' |
1334 |
-+ ;; |
1335 |
-+ esac |
1336 |
-+ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' |
1337 |
-+ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' |
1338 |
-+ shlibpath_overrides_runpath=yes |
1339 |
-+ shlibpath_var=DYLD_LIBRARY_PATH |
1340 |
- ;; |
1341 |
- |
1342 |
- hpux9* | hpux10*) |
1343 |
diff --git a/eclass/ELT-patches/darwin-ltconf/1.3.0 b/eclass/ELT-patches/darwin-ltconf/1.3.0 |
1344 |
deleted file mode 100644 |
1345 |
index 49ae67df4116..000000000000 |
1346 |
--- a/eclass/ELT-patches/darwin-ltconf/1.3.0 |
1347 |
+++ /dev/null |
1348 |
@@ -1,67 +0,0 @@ |
1349 |
---- ltconfig.darwin 2000-02-02 19:53:22.000000000 -0500 |
1350 |
-+++ ltconfig 2004-09-23 20:25:11.000000000 -0400 |
1351 |
-@@ -678,6 +678,11 @@ |
1352 |
- cygwin* | mingw* | os2*) |
1353 |
- # We can build DLLs from non-PIC. |
1354 |
- ;; |
1355 |
-+ darwin* | rhapsody*) |
1356 |
-+ # PIC is the default on this platform |
1357 |
-+ # Common symbols not allowed in MH_DYLIB files |
1358 |
-+ pic_flag='-fno-common' |
1359 |
-+ ;; |
1360 |
- amigaos*) |
1361 |
- # FIXME: we need at least 68020 code to build shared libraries, but |
1362 |
- # adding the `-m68020' flag to GCC prevents building anything better, |
1363 |
-@@ -1361,6 +1372,23 @@ |
1364 |
- hardcode_shlibpath_var=no |
1365 |
- ;; |
1366 |
- |
1367 |
-+ darwin* | rhapsody*) |
1368 |
-+ case "$host_os" in |
1369 |
-+ rhapsody* | darwin1.[012]) |
1370 |
-+ allow_undefined_flag='-undefined suppress' |
1371 |
-+ ;; |
1372 |
-+ *) # Darwin 1.3 on |
1373 |
-+ allow_undefined_flag='-flat_namespace -undefined suppress' |
1374 |
-+ ;; |
1375 |
-+ esac |
1376 |
-+ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' |
1377 |
-+ # We need to add '_' to the symbols in $export_symbols first |
1378 |
-+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' |
1379 |
-+ hardcode_direct=yes |
1380 |
-+ hardcode_shlibpath_var=no |
1381 |
-+ whole_archive_flag_spec='-all_load $convenience' |
1382 |
-+ ;; |
1383 |
-+ |
1384 |
- hpux9* | hpux10* | hpux11*) |
1385 |
- case "$host_os" in |
1386 |
- hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; |
1387 |
-@@ -1897,6 +1931,27 @@ |
1388 |
- esac |
1389 |
- ;; |
1390 |
- |
1391 |
-+darwin* | rhapsody*) |
1392 |
-+ dynamic_linker="$host_os dyld" |
1393 |
-+ version_type=darwin |
1394 |
-+ need_lib_prefix=no |
1395 |
-+ need_version=no |
1396 |
-+ deplibs_check_method='file_magic Mach-O dynamically linked shared library' |
1397 |
-+ file_magic_cmd='/usr/bin/file -L' |
1398 |
-+ case "$host_os" in |
1399 |
-+ rhapsody* | darwin1.[012]) |
1400 |
-+ file_magic_test_file='/System/Library/Frameworks/System.framework/System' |
1401 |
-+ ;; |
1402 |
-+ *) # Darwin 1.3 on |
1403 |
-+ file_magic_test_file='/usr/lib/libSystem.dylib' |
1404 |
-+ ;; |
1405 |
-+ esac |
1406 |
-+ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' |
1407 |
-+ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' |
1408 |
-+ shlibpath_overrides_runpath=yes |
1409 |
-+ shlibpath_var=DYLD_LIBRARY_PATH |
1410 |
-+ ;; |
1411 |
-+ |
1412 |
- gnu*) |
1413 |
- version_type=linux |
1414 |
- need_lib_prefix=no |
1415 |
- |
1416 |
diff --git a/eclass/ELT-patches/darwin-ltmain/1.2.0 b/eclass/ELT-patches/darwin-ltmain/1.2.0 |
1417 |
deleted file mode 100644 |
1418 |
index aaab86a72337..000000000000 |
1419 |
--- a/eclass/ELT-patches/darwin-ltmain/1.2.0 |
1420 |
+++ /dev/null |
1421 |
@@ -1,40 +0,0 @@ |
1422 |
---- ltmain.sh-1.2 Wed May 19 09:17:36 1999 |
1423 |
-+++ ltmain.sh Wed Oct 6 14:38:37 2004 |
1424 |
-@@ -967,6 +967,16 @@ |
1425 |
- versuffix="$current.$revision" |
1426 |
- ;; |
1427 |
- |
1428 |
-+ darwin) |
1429 |
-+ # Like Linux, but with the current version available in |
1430 |
-+ # verstring for coding it into the library header |
1431 |
-+ major=.`expr $current - $age` |
1432 |
-+ versuffix="$major.$age.$revision" |
1433 |
-+ # Darwin ld doesn't like 0 for these options... |
1434 |
-+ minor_current=`expr $current + 1` |
1435 |
-+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" |
1436 |
-+ ;; |
1437 |
-+ |
1438 |
- *) |
1439 |
- $echo "$modename: unknown library version type \`$version_type'" 1>&2 |
1440 |
- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 |
1441 |
-@@ -1000,9 +1010,17 @@ |
1442 |
- allow_undefined_flag="$no_undefined_flag" |
1443 |
- fi |
1444 |
- |
1445 |
-- # Add libc to deplibs on all systems. |
1446 |
-- dependency_libs="$deplibs" |
1447 |
-- deplibs="$deplibs -lc" |
1448 |
-+ case "$version_type" in |
1449 |
-+ rhapsody|darwin) |
1450 |
-+ # Rhapsody C library is in the System framework |
1451 |
-+ deplibs="$deplibs -framework System" |
1452 |
-+ ;; |
1453 |
-+ *) |
1454 |
-+ # Add libc to deplibs on all other systems. |
1455 |
-+ dependency_libs="$deplibs" |
1456 |
-+ deplibs="$deplibs -lc" |
1457 |
-+ ;; |
1458 |
-+ esac |
1459 |
- |
1460 |
- if test "$build_libtool_libs" = yes; then |
1461 |
- # Get the real and link names of the library. |
1462 |
diff --git a/eclass/ELT-patches/darwin-ltmain/1.3.0 b/eclass/ELT-patches/darwin-ltmain/1.3.0 |
1463 |
deleted file mode 100644 |
1464 |
index 7148efb99326..000000000000 |
1465 |
--- a/eclass/ELT-patches/darwin-ltmain/1.3.0 |
1466 |
+++ /dev/null |
1467 |
@@ -1,64 +0,0 @@ |
1468 |
---- ltmain.sh.darwin 2000-02-02 19:53:22.000000000 -0500 |
1469 |
-+++ ltmain.sh 2004-09-23 20:25:11.000000000 -0400 |
1470 |
-@@ -24,6 +24,8 @@ |
1471 |
- # configuration script generated by Autoconf, you may include it under |
1472 |
- # the same distribution terms that you use for the rest of that program. |
1473 |
- |
1474 |
-+_S_=${LIBTOOL_CMD_SEP-\~} |
1475 |
-+ |
1476 |
- # Check that we have a working $echo. |
1477 |
- if test "X$1" = X--no-reexec; then |
1478 |
- # Discard the --no-reexec flag, and continue. |
1479 |
-@@ -1079,6 +1079,11 @@ |
1480 |
- # These systems don't actually have c library (as such) |
1481 |
- continue |
1482 |
- ;; |
1483 |
-+ *-*-rhapsody* | *-*-darwin1.[012]) |
1484 |
-+ # Rhapsody C library is in the System framework |
1485 |
-+ deplibs="$deplibs -framework System" |
1486 |
-+ continue |
1487 |
-+ ;; |
1488 |
- esac |
1489 |
- elif test "$arg" = "-lm"; then |
1490 |
- case "$host" in |
1491 |
-@@ -1086,6 +1091,11 @@ |
1492 |
- # These systems don't actually have math library (as such) |
1493 |
- continue |
1494 |
- ;; |
1495 |
-+ *-*-rhapsody* | *-*-darwin1.[012]) |
1496 |
-+ # Rhapsody math library is in the System framework |
1497 |
-+ deplibs="$deplibs -framework System" |
1498 |
-+ continue |
1499 |
-+ ;; |
1500 |
- esac |
1501 |
- fi |
1502 |
- deplibs="$deplibs $arg" |
1503 |
-@@ -1753,6 +1763,16 @@ |
1504 |
- versuffix="-$major-$age-$revision" |
1505 |
- ;; |
1506 |
- |
1507 |
-+ darwin) |
1508 |
-+ # Like Linux, but with the current version available in |
1509 |
-+ # verstring for coding it into the library header |
1510 |
-+ major=.`expr $current - $age` |
1511 |
-+ versuffix="$major.$age.$revision" |
1512 |
-+ # Darwin ld doesn't like 0 for these options... |
1513 |
-+ minor_current=`expr $current + 1` |
1514 |
-+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" |
1515 |
-+ ;; |
1516 |
-+ |
1517 |
- *) |
1518 |
- $echo "$modename: unknown library version type \`$version_type'" 1>&2 |
1519 |
- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 |
1520 |
-@@ -1795,6 +1824,10 @@ |
1521 |
- *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) |
1522 |
- # these systems don't actually have a c library (as such)! |
1523 |
- ;; |
1524 |
-+ *-*-rhapsody* | *-*-darwin1.[012]) |
1525 |
-+ # Rhapsody C library is in the System framework |
1526 |
-+ deplibs="$deplibs -framework System" |
1527 |
-+ ;; |
1528 |
- *) |
1529 |
- # Add libc to deplibs on all other systems. |
1530 |
- deplibs="$deplibs -lc" |
1531 |
- |
1532 |
diff --git a/eclass/ELT-patches/deplibs/1.5 b/eclass/ELT-patches/deplibs/1.5 |
1533 |
deleted file mode 100644 |
1534 |
index 36c507ade3f3..000000000000 |
1535 |
--- a/eclass/ELT-patches/deplibs/1.5 |
1536 |
+++ /dev/null |
1537 |
@@ -1,18 +0,0 @@ |
1538 |
---- libtool.orig 2009-07-15 16:25:32 +0200 |
1539 |
-+++ libtool 2009-07-15 16:51:56 +0200 |
1540 |
-@@ -3319,7 +3319,14 @@ |
1541 |
- ;; |
1542 |
- esac |
1543 |
- if grep "^installed=no" $deplib > /dev/null; then |
1544 |
-- path="$absdir/$objdir" |
1545 |
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
1546 |
-+ eval library_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
1547 |
-+ for library_name in ${library_names}; do :; done |
1548 |
-+ if test $mode = relink && test -f "${inst_prefix_dir}${libdir}/${library_name}"; then |
1549 |
-+ path="${inst_prefix_dir}${libdir}" |
1550 |
-+ else |
1551 |
-+ path="$absdir/$objdir" |
1552 |
-+ fi |
1553 |
- else |
1554 |
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
1555 |
- if test -z "$libdir"; then |
1556 |
diff --git a/eclass/ELT-patches/deplibs/2.1b b/eclass/ELT-patches/deplibs/2.1b |
1557 |
deleted file mode 100644 |
1558 |
index 3df590df7f68..000000000000 |
1559 |
--- a/eclass/ELT-patches/deplibs/2.1b |
1560 |
+++ /dev/null |
1561 |
@@ -1,18 +0,0 @@ |
1562 |
---- ltmain-release-2-1b.in 2009-06-22 15:33:26.000000000 +0200 |
1563 |
-+++ ltmain-release-2-1b.in.new 2009-07-15 16:59:45.000000000 +0200 |
1564 |
-@@ -4946,7 +4946,14 @@ |
1565 |
- fi |
1566 |
- ;; |
1567 |
- *) |
1568 |
-- path="-L$absdir/$objdir" |
1569 |
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
1570 |
-+ eval library_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
1571 |
-+ for library_name in ${library_names}; do :; done |
1572 |
-+ if test $mode = relink && test -f "${inst_prefix_dir}${libdir}/${library_name}"; then |
1573 |
-+ path="-L${inst_prefix_dir}${libdir}" |
1574 |
-+ else |
1575 |
-+ path="-L$absdir/$objdir" |
1576 |
-+ fi |
1577 |
- ;; |
1578 |
- esac |
1579 |
- else |
1580 |
diff --git a/eclass/ELT-patches/fbsd-conf/00broken-libglade b/eclass/ELT-patches/fbsd-conf/00broken-libglade |
1581 |
deleted file mode 100644 |
1582 |
index df3c4384c445..000000000000 |
1583 |
--- a/eclass/ELT-patches/fbsd-conf/00broken-libglade |
1584 |
+++ /dev/null |
1585 |
@@ -1,33 +0,0 @@ |
1586 |
-Index: tiff-3.8.2/configure |
1587 |
-=================================================================== |
1588 |
---- tiff-3.8.2.orig/configure |
1589 |
-+++ tiff-3.8.2/configure |
1590 |
-@@ -8199,7 +8199,14 @@ freebsd* | dragonfly*) |
1591 |
- *) objformat=elf ;; |
1592 |
- esac |
1593 |
- fi |
1594 |
-- version_type=freebsd-$objformat |
1595 |
-+ # Handle Gentoo/FreeBSD as it was Linux |
1596 |
-+ case $host_vendor in |
1597 |
-+ gentoo) |
1598 |
-+ version_type=linux ;; |
1599 |
-+ *) |
1600 |
-+ version_type=freebsd-$objformat ;; |
1601 |
-+ esac |
1602 |
-+ |
1603 |
- case $version_type in |
1604 |
- freebsd-elf*) |
1605 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1606 |
-@@ -8210,6 +8216,12 @@ freebsd* | dragonfly*) |
1607 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1608 |
- need_version=yes |
1609 |
- ;; |
1610 |
-+ linux) |
1611 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1612 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1613 |
-+ need_lib_prefix=no |
1614 |
-+ need_version=no |
1615 |
-+ ;; |
1616 |
- esac |
1617 |
- shlibpath_var=LD_LIBRARY_PATH |
1618 |
- case $host_os in |
1619 |
\ No newline at end of file |
1620 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.4.0 b/eclass/ELT-patches/fbsd-conf/1.4.0 |
1621 |
deleted file mode 100644 |
1622 |
index b986f8d8f519..000000000000 |
1623 |
--- a/eclass/ELT-patches/fbsd-conf/1.4.0 |
1624 |
+++ /dev/null |
1625 |
@@ -1,32 +0,0 @@ |
1626 |
-Index: expat-1.95.8/configure |
1627 |
-=================================================================== |
1628 |
---- expat-1.95.8.orig/configure |
1629 |
-+++ expat-1.95.8/configure |
1630 |
-@@ -5479,7 +5479,13 @@ freebsd1*) |
1631 |
- |
1632 |
- freebsd*) |
1633 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
1634 |
-- version_type=freebsd-$objformat |
1635 |
-+ case $host_vendor in |
1636 |
-+ gentoo) |
1637 |
-+ version_type=linux ;; |
1638 |
-+ *) |
1639 |
-+ version_type=freebsd-$objformat ;; |
1640 |
-+ esac |
1641 |
-+ |
1642 |
- case $version_type in |
1643 |
- freebsd-elf*) |
1644 |
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' |
1645 |
-@@ -5490,6 +5496,12 @@ freebsd*) |
1646 |
- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' |
1647 |
- need_version=yes |
1648 |
- ;; |
1649 |
-+ linux) |
1650 |
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so' |
1651 |
-+ soname_spec='${libname}${release}.so$major' |
1652 |
-+ need_lib_prefix=no |
1653 |
-+ need_version=no |
1654 |
-+ ;; |
1655 |
- esac |
1656 |
- shlibpath_var=LD_LIBRARY_PATH |
1657 |
- case $host_os in |
1658 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.5.10 b/eclass/ELT-patches/fbsd-conf/1.5.10 |
1659 |
deleted file mode 100644 |
1660 |
index 90c63475bcce..000000000000 |
1661 |
--- a/eclass/ELT-patches/fbsd-conf/1.5.10 |
1662 |
+++ /dev/null |
1663 |
@@ -1,120 +0,0 @@ |
1664 |
-Index: libiconv-1.10/configure |
1665 |
-=================================================================== |
1666 |
---- libiconv-1.10.orig/configure |
1667 |
-+++ libiconv-1.10/configure |
1668 |
-@@ -8902,7 +8902,14 @@ kfreebsd*-gnu) |
1669 |
- |
1670 |
- freebsd*) |
1671 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
1672 |
-- version_type=freebsd-$objformat |
1673 |
-+ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly. |
1674 |
-+ case $host_vendor in |
1675 |
-+ gentoo) |
1676 |
-+ version_type=linux ;; |
1677 |
-+ *) |
1678 |
-+ version_type=freebsd-$objformat ;; |
1679 |
-+ esac |
1680 |
-+ |
1681 |
- case $version_type in |
1682 |
- freebsd-elf*) |
1683 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1684 |
-@@ -8913,6 +8920,12 @@ freebsd*) |
1685 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1686 |
- need_version=yes |
1687 |
- ;; |
1688 |
-+ linux) |
1689 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1690 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1691 |
-+ need_lib_prefix=no |
1692 |
-+ need_version=no |
1693 |
-+ ;; |
1694 |
- esac |
1695 |
- shlibpath_var=LD_LIBRARY_PATH |
1696 |
- case $host_os in |
1697 |
-@@ -12620,7 +12633,14 @@ kfreebsd*-gnu) |
1698 |
- |
1699 |
- freebsd*) |
1700 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
1701 |
-- version_type=freebsd-$objformat |
1702 |
-+ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly. |
1703 |
-+ case $host_vendor in |
1704 |
-+ gentoo) |
1705 |
-+ version_type=linux ;; |
1706 |
-+ *) |
1707 |
-+ version_type=freebsd-$objformat ;; |
1708 |
-+ esac |
1709 |
-+ |
1710 |
- case $version_type in |
1711 |
- freebsd-elf*) |
1712 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1713 |
-@@ -12631,6 +12651,12 @@ freebsd*) |
1714 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1715 |
- need_version=yes |
1716 |
- ;; |
1717 |
-+ linux) |
1718 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1719 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1720 |
-+ need_lib_prefix=no |
1721 |
-+ need_version=no |
1722 |
-+ ;; |
1723 |
- esac |
1724 |
- shlibpath_var=LD_LIBRARY_PATH |
1725 |
- case $host_os in |
1726 |
-@@ -15784,7 +15810,14 @@ kfreebsd*-gnu) |
1727 |
- |
1728 |
- freebsd*) |
1729 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
1730 |
-- version_type=freebsd-$objformat |
1731 |
-+ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly. |
1732 |
-+ case $host_vendor in |
1733 |
-+ gentoo) |
1734 |
-+ version_type=linux ;; |
1735 |
-+ *) |
1736 |
-+ version_type=freebsd-$objformat ;; |
1737 |
-+ esac |
1738 |
-+ |
1739 |
- case $version_type in |
1740 |
- freebsd-elf*) |
1741 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1742 |
-@@ -15795,6 +15828,12 @@ freebsd*) |
1743 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1744 |
- need_version=yes |
1745 |
- ;; |
1746 |
-+ linux) |
1747 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1748 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1749 |
-+ need_lib_prefix=no |
1750 |
-+ need_version=no |
1751 |
-+ ;; |
1752 |
- esac |
1753 |
- shlibpath_var=LD_LIBRARY_PATH |
1754 |
- case $host_os in |
1755 |
-@@ -18150,7 +18189,14 @@ kfreebsd*-gnu) |
1756 |
- |
1757 |
- freebsd*) |
1758 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
1759 |
-- version_type=freebsd-$objformat |
1760 |
-+ # Gentoo/FreeBSD uses linux-style versioning to be user-friendly. |
1761 |
-+ case $host_vendor in |
1762 |
-+ gentoo) |
1763 |
-+ version_type=linux ;; |
1764 |
-+ *) |
1765 |
-+ version_type=freebsd-$objformat ;; |
1766 |
-+ esac |
1767 |
-+ |
1768 |
- case $version_type in |
1769 |
- freebsd-elf*) |
1770 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1771 |
-@@ -18161,6 +18207,12 @@ freebsd*) |
1772 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1773 |
- need_version=yes |
1774 |
- ;; |
1775 |
-+ linux) |
1776 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1777 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1778 |
-+ need_lib_prefix=no |
1779 |
-+ need_version=no |
1780 |
-+ ;; |
1781 |
- esac |
1782 |
- shlibpath_var=LD_LIBRARY_PATH |
1783 |
- case $host_os in |
1784 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.5.18 b/eclass/ELT-patches/fbsd-conf/1.5.18 |
1785 |
deleted file mode 100644 |
1786 |
index 0636cebfcfa7..000000000000 |
1787 |
--- a/eclass/ELT-patches/fbsd-conf/1.5.18 |
1788 |
+++ /dev/null |
1789 |
@@ -1,116 +0,0 @@ |
1790 |
-Index: libtool-1.5.18/configure |
1791 |
-=================================================================== |
1792 |
---- libtool-1.5.18.orig/configure |
1793 |
-+++ libtool-1.5.18/configure |
1794 |
-@@ -8433,7 +8433,13 @@ freebsd* | dragonfly*) |
1795 |
- # DragonFly does not have aout. When/if they implement a new |
1796 |
- # versioning mechanism, adjust this. |
1797 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
1798 |
-- version_type=freebsd-$objformat |
1799 |
-+ case $host_vendor in |
1800 |
-+ gentoo) |
1801 |
-+ version_type=linux ;; |
1802 |
-+ *) |
1803 |
-+ version_type=freebsd-$objformat ;; |
1804 |
-+ esac |
1805 |
-+ |
1806 |
- case $version_type in |
1807 |
- freebsd-elf*) |
1808 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1809 |
-@@ -8444,6 +8450,12 @@ freebsd* | dragonfly*) |
1810 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1811 |
- need_version=yes |
1812 |
- ;; |
1813 |
-+ linux) |
1814 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1815 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1816 |
-+ need_lib_prefix=no |
1817 |
-+ need_version=no |
1818 |
-+ ;; |
1819 |
- esac |
1820 |
- shlibpath_var=LD_LIBRARY_PATH |
1821 |
- case $host_os in |
1822 |
-@@ -12205,7 +12217,13 @@ freebsd* | dragonfly*) |
1823 |
- # DragonFly does not have aout. When/if they implement a new |
1824 |
- # versioning mechanism, adjust this. |
1825 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
1826 |
-- version_type=freebsd-$objformat |
1827 |
-+ case $host_vendor in |
1828 |
-+ gentoo) |
1829 |
-+ version_type=linux ;; |
1830 |
-+ *) |
1831 |
-+ version_type=freebsd-$objformat ;; |
1832 |
-+ esac |
1833 |
-+ |
1834 |
- case $version_type in |
1835 |
- freebsd-elf*) |
1836 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1837 |
-@@ -12216,6 +12234,12 @@ freebsd* | dragonfly*) |
1838 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1839 |
- need_version=yes |
1840 |
- ;; |
1841 |
-+ linux) |
1842 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1843 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1844 |
-+ need_lib_prefix=no |
1845 |
-+ need_version=no |
1846 |
-+ ;; |
1847 |
- esac |
1848 |
- shlibpath_var=LD_LIBRARY_PATH |
1849 |
- case $host_os in |
1850 |
-@@ -15461,7 +15485,13 @@ freebsd* | dragonfly*) |
1851 |
- # DragonFly does not have aout. When/if they implement a new |
1852 |
- # versioning mechanism, adjust this. |
1853 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
1854 |
-- version_type=freebsd-$objformat |
1855 |
-+ case $host_vendor in |
1856 |
-+ gentoo) |
1857 |
-+ version_type=linux ;; |
1858 |
-+ *) |
1859 |
-+ version_type=freebsd-$objformat ;; |
1860 |
-+ esac |
1861 |
-+ |
1862 |
- case $version_type in |
1863 |
- freebsd-elf*) |
1864 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1865 |
-@@ -15472,6 +15502,12 @@ freebsd* | dragonfly*) |
1866 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1867 |
- need_version=yes |
1868 |
- ;; |
1869 |
-+ linux) |
1870 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1871 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1872 |
-+ need_lib_prefix=no |
1873 |
-+ need_version=no |
1874 |
-+ ;; |
1875 |
- esac |
1876 |
- shlibpath_var=LD_LIBRARY_PATH |
1877 |
- case $host_os in |
1878 |
-@@ -17929,7 +17965,13 @@ freebsd* | dragonfly*) |
1879 |
- # DragonFly does not have aout. When/if they implement a new |
1880 |
- # versioning mechanism, adjust this. |
1881 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
1882 |
-- version_type=freebsd-$objformat |
1883 |
-+ case $host_vendor in |
1884 |
-+ gentoo) |
1885 |
-+ version_type=linux ;; |
1886 |
-+ *) |
1887 |
-+ version_type=freebsd-$objformat ;; |
1888 |
-+ esac |
1889 |
-+ |
1890 |
- case $version_type in |
1891 |
- freebsd-elf*) |
1892 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1893 |
-@@ -17940,6 +17982,12 @@ freebsd* | dragonfly*) |
1894 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1895 |
- need_version=yes |
1896 |
- ;; |
1897 |
-+ linux) |
1898 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1899 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1900 |
-+ need_lib_prefix=no |
1901 |
-+ need_version=no |
1902 |
-+ ;; |
1903 |
- esac |
1904 |
- shlibpath_var=LD_LIBRARY_PATH |
1905 |
- case $host_os in |
1906 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.5.20 b/eclass/ELT-patches/fbsd-conf/1.5.20 |
1907 |
deleted file mode 100644 |
1908 |
index e17920f8f809..000000000000 |
1909 |
--- a/eclass/ELT-patches/fbsd-conf/1.5.20 |
1910 |
+++ /dev/null |
1911 |
@@ -1,116 +0,0 @@ |
1912 |
-Index: libtool-1.5.20/configure |
1913 |
-=================================================================== |
1914 |
---- libtool-1.5.20.orig/configure |
1915 |
-+++ libtool-1.5.20/configure |
1916 |
-@@ -8441,7 +8441,13 @@ freebsd* | dragonfly*) |
1917 |
- *) objformat=elf ;; |
1918 |
- esac |
1919 |
- fi |
1920 |
-- version_type=freebsd-$objformat |
1921 |
-+ case $host_vendor in |
1922 |
-+ gentoo) |
1923 |
-+ version_type=linux ;; |
1924 |
-+ *) |
1925 |
-+ version_type=freebsd-$objformat ;; |
1926 |
-+ esac |
1927 |
-+ |
1928 |
- case $version_type in |
1929 |
- freebsd-elf*) |
1930 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1931 |
-@@ -8452,6 +8458,12 @@ freebsd* | dragonfly*) |
1932 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1933 |
- need_version=yes |
1934 |
- ;; |
1935 |
-+ linux) |
1936 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1937 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1938 |
-+ need_lib_prefix=no |
1939 |
-+ need_version=no |
1940 |
-+ ;; |
1941 |
- esac |
1942 |
- shlibpath_var=LD_LIBRARY_PATH |
1943 |
- case $host_os in |
1944 |
-@@ -12228,7 +12240,13 @@ freebsd* | dragonfly*) |
1945 |
- *) objformat=elf ;; |
1946 |
- esac |
1947 |
- fi |
1948 |
-- version_type=freebsd-$objformat |
1949 |
-+ case $host_vendor in |
1950 |
-+ gentoo) |
1951 |
-+ version_type=linux ;; |
1952 |
-+ *) |
1953 |
-+ version_type=freebsd-$objformat ;; |
1954 |
-+ esac |
1955 |
-+ |
1956 |
- case $version_type in |
1957 |
- freebsd-elf*) |
1958 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1959 |
-@@ -12239,6 +12257,12 @@ freebsd* | dragonfly*) |
1960 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1961 |
- need_version=yes |
1962 |
- ;; |
1963 |
-+ linux) |
1964 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1965 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1966 |
-+ need_lib_prefix=no |
1967 |
-+ need_version=no |
1968 |
-+ ;; |
1969 |
- esac |
1970 |
- shlibpath_var=LD_LIBRARY_PATH |
1971 |
- case $host_os in |
1972 |
-@@ -15492,7 +15516,13 @@ freebsd* | dragonfly*) |
1973 |
- *) objformat=elf ;; |
1974 |
- esac |
1975 |
- fi |
1976 |
-- version_type=freebsd-$objformat |
1977 |
-+ case $host_vendor in |
1978 |
-+ gentoo) |
1979 |
-+ version_type=linux ;; |
1980 |
-+ *) |
1981 |
-+ version_type=freebsd-$objformat ;; |
1982 |
-+ esac |
1983 |
-+ |
1984 |
- case $version_type in |
1985 |
- freebsd-elf*) |
1986 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
1987 |
-@@ -15503,6 +15533,12 @@ freebsd* | dragonfly*) |
1988 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
1989 |
- need_version=yes |
1990 |
- ;; |
1991 |
-+ linux) |
1992 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1993 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
1994 |
-+ need_lib_prefix=no |
1995 |
-+ need_version=no |
1996 |
-+ ;; |
1997 |
- esac |
1998 |
- shlibpath_var=LD_LIBRARY_PATH |
1999 |
- case $host_os in |
2000 |
-@@ -17968,7 +18004,13 @@ freebsd* | dragonfly*) |
2001 |
- *) objformat=elf ;; |
2002 |
- esac |
2003 |
- fi |
2004 |
-- version_type=freebsd-$objformat |
2005 |
-+ case $host_vendor in |
2006 |
-+ gentoo) |
2007 |
-+ version_type=linux ;; |
2008 |
-+ *) |
2009 |
-+ version_type=freebsd-$objformat ;; |
2010 |
-+ esac |
2011 |
-+ |
2012 |
- case $version_type in |
2013 |
- freebsd-elf*) |
2014 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
2015 |
-@@ -17979,6 +18021,12 @@ freebsd* | dragonfly*) |
2016 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
2017 |
- need_version=yes |
2018 |
- ;; |
2019 |
-+ linux) |
2020 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2021 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
2022 |
-+ need_lib_prefix=no |
2023 |
-+ need_version=no |
2024 |
-+ ;; |
2025 |
- esac |
2026 |
- shlibpath_var=LD_LIBRARY_PATH |
2027 |
- case $host_os in |
2028 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.5.20b b/eclass/ELT-patches/fbsd-conf/1.5.20b |
2029 |
deleted file mode 100644 |
2030 |
index 0659b1c3cb5f..000000000000 |
2031 |
--- a/eclass/ELT-patches/fbsd-conf/1.5.20b |
2032 |
+++ /dev/null |
2033 |
@@ -1,61 +0,0 @@ |
2034 |
-Index: tiff-3.8.2/configure |
2035 |
-=================================================================== |
2036 |
---- tiff-3.8.2.orig/configure |
2037 |
-+++ tiff-3.8.2/configure |
2038 |
-@@ -8199,7 +8199,14 @@ freebsd* | dragonfly*) |
2039 |
- *) objformat=elf ;; |
2040 |
- esac |
2041 |
- fi |
2042 |
-- version_type=freebsd-$objformat |
2043 |
-+ # Handle Gentoo/FreeBSD as it was Linux |
2044 |
-+ case $host_vendor in |
2045 |
-+ gentoo) |
2046 |
-+ version_type=linux ;; |
2047 |
-+ *) |
2048 |
-+ version_type=freebsd-$objformat ;; |
2049 |
-+ esac |
2050 |
-+ |
2051 |
- case $version_type in |
2052 |
- freebsd-elf*) |
2053 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
2054 |
-@@ -8210,6 +8216,12 @@ freebsd* | dragonfly*) |
2055 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
2056 |
- need_version=yes |
2057 |
- ;; |
2058 |
-+ linux) |
2059 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2060 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
2061 |
-+ need_lib_prefix=no |
2062 |
-+ need_version=no |
2063 |
-+ ;; |
2064 |
- esac |
2065 |
- shlibpath_var=LD_LIBRARY_PATH |
2066 |
- case $host_os in |
2067 |
-@@ -19253,7 +19265,13 @@ freebsd* | dragonfly*) |
2068 |
- *) objformat=elf ;; |
2069 |
- esac |
2070 |
- fi |
2071 |
-- version_type=freebsd-$objformat |
2072 |
-+ case $host_vendor in |
2073 |
-+ gentoo) |
2074 |
-+ version_type=linux ;; |
2075 |
-+ *) |
2076 |
-+ version_type=freebsd-$objformat ;; |
2077 |
-+ esac |
2078 |
-+ |
2079 |
- case $version_type in |
2080 |
- freebsd-elf*) |
2081 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
2082 |
-@@ -19264,6 +19282,12 @@ freebsd* | dragonfly*) |
2083 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
2084 |
- need_version=yes |
2085 |
- ;; |
2086 |
-+ linux) |
2087 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2088 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
2089 |
-+ need_lib_prefix=no |
2090 |
-+ need_version=no |
2091 |
-+ ;; |
2092 |
- esac |
2093 |
- shlibpath_var=LD_LIBRARY_PATH |
2094 |
- case $host_os in |
2095 |
diff --git a/eclass/ELT-patches/fbsd-conf/1.9f b/eclass/ELT-patches/fbsd-conf/1.9f |
2096 |
deleted file mode 100644 |
2097 |
index f16ddb874c19..000000000000 |
2098 |
--- a/eclass/ELT-patches/fbsd-conf/1.9f |
2099 |
+++ /dev/null |
2100 |
@@ -1,60 +0,0 @@ |
2101 |
-Index: libtorrent-0.10.0/configure |
2102 |
-=================================================================== |
2103 |
---- libtorrent-0.10.0.orig/configure |
2104 |
-+++ libtorrent-0.10.0/configure |
2105 |
-@@ -8173,7 +8173,13 @@ kfreebsd*-gnu) |
2106 |
- |
2107 |
- freebsd*) |
2108 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || $ECHO aout` |
2109 |
-- version_type=freebsd-$objformat |
2110 |
-+ case $host_vendor in |
2111 |
-+ gentoo) |
2112 |
-+ version_type=linux ;; |
2113 |
-+ *) |
2114 |
-+ version_type=freebsd-$objformat ;; |
2115 |
-+ esac |
2116 |
-+ |
2117 |
- case $version_type in |
2118 |
- freebsd-elf*) |
2119 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
2120 |
-@@ -8184,6 +8190,12 @@ freebsd*) |
2121 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
2122 |
- need_version=yes |
2123 |
- ;; |
2124 |
-+ linux) |
2125 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2126 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
2127 |
-+ need_lib_prefix=no |
2128 |
-+ need_version=no |
2129 |
-+ ;; |
2130 |
- esac |
2131 |
- shlibpath_var=LD_LIBRARY_PATH |
2132 |
- case $host_os in |
2133 |
-@@ -12461,7 +12473,13 @@ kfreebsd*-gnu) |
2134 |
- |
2135 |
- freebsd*) |
2136 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || $ECHO aout` |
2137 |
-- version_type=freebsd-$objformat |
2138 |
-+ case $host_vendor in |
2139 |
-+ gentoo) |
2140 |
-+ version_type=linux ;; |
2141 |
-+ *) |
2142 |
-+ version_type=freebsd-$objformat ;; |
2143 |
-+ esac |
2144 |
-+ |
2145 |
- case $version_type in |
2146 |
- freebsd-elf*) |
2147 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
2148 |
-@@ -12472,6 +12490,12 @@ freebsd*) |
2149 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
2150 |
- need_version=yes |
2151 |
- ;; |
2152 |
-+ linux) |
2153 |
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2154 |
-+ soname_spec='${libname}${release}${shared_ext}$major' |
2155 |
-+ need_lib_prefix=no |
2156 |
-+ need_version=no |
2157 |
-+ ;; |
2158 |
- esac |
2159 |
- shlibpath_var=LD_LIBRARY_PATH |
2160 |
- case $host_os in |
2161 |
diff --git a/eclass/ELT-patches/fbsd-ltconf/1.2.0 b/eclass/ELT-patches/fbsd-ltconf/1.2.0 |
2162 |
deleted file mode 100644 |
2163 |
index 7d2f554f253b..000000000000 |
2164 |
--- a/eclass/ELT-patches/fbsd-ltconf/1.2.0 |
2165 |
+++ /dev/null |
2166 |
@@ -1,26 +0,0 @@ |
2167 |
-Index: jpeg-6b/ltconfig |
2168 |
-=================================================================== |
2169 |
---- jpeg-6b.orig/ltconfig |
2170 |
-+++ jpeg-6b/ltconfig |
2171 |
-@@ -1126,9 +1126,18 @@ amigaos*) |
2172 |
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' |
2173 |
- ;; |
2174 |
- |
2175 |
--freebsd2* | freebsd3*) |
2176 |
-- version_type=sunos |
2177 |
-- library_names_spec='${libname}${release}.so.$versuffix $libname.so' |
2178 |
-+freebsd[234567]*) |
2179 |
-+ case $host_vendor in |
2180 |
-+ gentoo) |
2181 |
-+ version_type=linux |
2182 |
-+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}.so' |
2183 |
-+ soname_spec='${libname}${release}.so.$major' |
2184 |
-+ ;; |
2185 |
-+ *) |
2186 |
-+ version_type=sunos |
2187 |
-+ library_names_spec='${libname}${release}.so.$versuffix $libname.so' |
2188 |
-+ ;; |
2189 |
-+ esac |
2190 |
- finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' |
2191 |
- shlibpath_var=LD_LIBRARY_PATH |
2192 |
- ;; |
2193 |
diff --git a/eclass/ELT-patches/fbsd-ltconf/1.3.0 b/eclass/ELT-patches/fbsd-ltconf/1.3.0 |
2194 |
deleted file mode 100644 |
2195 |
index 69aa94e678f2..000000000000 |
2196 |
--- a/eclass/ELT-patches/fbsd-ltconf/1.3.0 |
2197 |
+++ /dev/null |
2198 |
@@ -1,32 +0,0 @@ |
2199 |
-Index: libtool-1.3.5/ltconfig |
2200 |
-=================================================================== |
2201 |
---- libtool-1.3.5.orig/ltconfig |
2202 |
-+++ libtool-1.3.5/ltconfig |
2203 |
-@@ -1888,7 +1888,13 @@ freebsd1*) |
2204 |
- |
2205 |
- freebsd*) |
2206 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
2207 |
-- version_type=freebsd-$objformat |
2208 |
-+ case $host_vendor in |
2209 |
-+ gentoo) |
2210 |
-+ version_type=linux ;; |
2211 |
-+ *) |
2212 |
-+ version_type=freebsd-$objformat ;; |
2213 |
-+ esac |
2214 |
-+ |
2215 |
- case "$version_type" in |
2216 |
- freebsd-elf*) |
2217 |
- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' |
2218 |
-@@ -1903,6 +1909,12 @@ freebsd*) |
2219 |
- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' |
2220 |
- need_version=yes |
2221 |
- ;; |
2222 |
-+ linux) |
2223 |
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so' |
2224 |
-+ soname_spec='${libname}${release}.so$major' |
2225 |
-+ need_lib_prefix=no |
2226 |
-+ need_version=no |
2227 |
-+ ;; |
2228 |
- esac |
2229 |
- shlibpath_var=LD_LIBRARY_PATH |
2230 |
- case "$host_os" in |
2231 |
diff --git a/eclass/ELT-patches/fbsd-ltconf/1.4a b/eclass/ELT-patches/fbsd-ltconf/1.4a |
2232 |
deleted file mode 100644 |
2233 |
index 00084070dfb7..000000000000 |
2234 |
--- a/eclass/ELT-patches/fbsd-ltconf/1.4a |
2235 |
+++ /dev/null |
2236 |
@@ -1,32 +0,0 @@ |
2237 |
-Index: binutils-2.16.1/ltconfig |
2238 |
-=================================================================== |
2239 |
---- binutils-2.16.1.orig/ltconfig |
2240 |
-+++ binutils-2.16.1/ltconfig |
2241 |
-@@ -1129,7 +1129,13 @@ freebsd1*) |
2242 |
- |
2243 |
- freebsd*) |
2244 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
2245 |
-- version_type=freebsd-$objformat |
2246 |
-+ case $host_vendor in |
2247 |
-+ gentoo) |
2248 |
-+ version_type=linux ;; |
2249 |
-+ *) |
2250 |
-+ version_type=freebsd-$objformat ;; |
2251 |
-+ esac |
2252 |
-+ |
2253 |
- case $version_type in |
2254 |
- freebsd-elf*) |
2255 |
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' |
2256 |
-@@ -1141,6 +1147,12 @@ freebsd*) |
2257 |
- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' |
2258 |
- need_version=yes |
2259 |
- ;; |
2260 |
-+ linux) |
2261 |
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so' |
2262 |
-+ soname_spec='${libname}${release}.so$major' |
2263 |
-+ need_lib_prefix=no |
2264 |
-+ need_version=no |
2265 |
-+ ;; |
2266 |
- esac |
2267 |
- shlibpath_var=LD_LIBRARY_PATH |
2268 |
- case $host_os in |
2269 |
diff --git a/eclass/ELT-patches/fbsd-ltconf/1.4a-GCC3.0 b/eclass/ELT-patches/fbsd-ltconf/1.4a-GCC3.0 |
2270 |
deleted file mode 100644 |
2271 |
index e88bb4582aed..000000000000 |
2272 |
--- a/eclass/ELT-patches/fbsd-ltconf/1.4a-GCC3.0 |
2273 |
+++ /dev/null |
2274 |
@@ -1,32 +0,0 @@ |
2275 |
-Index: binutils-2.16.1/ltconfig |
2276 |
-=================================================================== |
2277 |
---- binutils-2.16.1.orig/ltconfig |
2278 |
-+++ binutils-2.16.1/ltconfig |
2279 |
-@@ -1129,7 +1129,13 @@ freebsd1*) |
2280 |
- |
2281 |
- freebsd*) |
2282 |
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` |
2283 |
-- version_type=freebsd-$objformat |
2284 |
-+ case $host_vendor in |
2285 |
-+ gentoo) |
2286 |
-+ version_type=linux ;; |
2287 |
-+ *) |
2288 |
-+ version_type=freebsd-$objformat ;; |
2289 |
-+ esac |
2290 |
-+ |
2291 |
- case $version_type in |
2292 |
- freebsd-elf*) |
2293 |
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' |
2294 |
-@@ -1141,6 +1147,12 @@ freebsd*) |
2295 |
- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' |
2296 |
- need_version=yes |
2297 |
- ;; |
2298 |
-+ linux) |
2299 |
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so' |
2300 |
-+ soname_spec='${libname}${release}.so$major' |
2301 |
-+ need_lib_prefix=no |
2302 |
-+ need_version=no |
2303 |
-+ ;; |
2304 |
- esac |
2305 |
- shlibpath_var=LD_LIBRARY_PATH |
2306 |
- case $host_os in |
2307 |
diff --git a/eclass/ELT-patches/fix-relink/1.4.0 b/eclass/ELT-patches/fix-relink/1.4.0 |
2308 |
deleted file mode 100644 |
2309 |
index 1b12c9b1a360..000000000000 |
2310 |
--- a/eclass/ELT-patches/fix-relink/1.4.0 |
2311 |
+++ /dev/null |
2312 |
@@ -1,63 +0,0 @@ |
2313 |
---- ltmain.sh 2003-09-24 18:22:17.528129376 +0200 |
2314 |
-+++ ltmain.sh 2003-09-24 18:23:17.101072912 +0200 |
2315 |
-@@ -1582,6 +1582,8 @@ |
2316 |
- # Only check for convenience libraries |
2317 |
- deplibs="$lib $deplibs" |
2318 |
- tmp_libs= |
2319 |
-+ # PKGW |
2320 |
-+ dependency_libs= |
2321 |
- for deplib in $dependency_libs; do |
2322 |
- #echo "Adding $deplib to \$deplibs" |
2323 |
- deplibs="$deplib $deplibs" |
2324 |
-@@ -1699,6 +1701,8 @@ |
2325 |
- fi |
2326 |
- |
2327 |
- tmp_libs= |
2328 |
-+ #PKGW |
2329 |
-+ dependency_libs= |
2330 |
- for deplib in $dependency_libs; do |
2331 |
- case $deplib in |
2332 |
- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
2333 |
-@@ -1860,6 +1864,16 @@ |
2334 |
- add="$dir/$linklib" |
2335 |
- elif test "$hardcode_minus_L" = yes; then |
2336 |
- add_dir="-L$dir" |
2337 |
-+ # Try looking first in the location we're being installed to. |
2338 |
-+ if test -n "$inst_prefix_dir"; then |
2339 |
-+ case "$libdir" in |
2340 |
-+ [\\/]*) |
2341 |
-+ # Add the install location to the beginning, minimising possiblilty |
2342 |
-+ # of linking to older version of the lib already installed. |
2343 |
-+ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
2344 |
-+ ;; |
2345 |
-+ esac |
2346 |
-+ fi |
2347 |
- add="-l$name" |
2348 |
- elif test "$hardcode_shlibpath_var" = yes; then |
2349 |
- add_shlibpath="$dir" |
2350 |
-@@ -1918,6 +1932,16 @@ |
2351 |
- else |
2352 |
- # We cannot seem to hardcode it, guess we'll fake it. |
2353 |
- add_dir="-L$libdir" |
2354 |
-+ # Try looking first in the location we're being installed to. |
2355 |
-+ if test -n "$inst_prefix_dir"; then |
2356 |
-+ case "$libdir" in |
2357 |
-+ [\\/]*) |
2358 |
-+ # Add the install location to the beginning, minimising possiblilty |
2359 |
-+ # of linking to older version of the lib already installed. |
2360 |
-+ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
2361 |
-+ ;; |
2362 |
-+ esac |
2363 |
-+ fi |
2364 |
- add="-l$name" |
2365 |
- fi |
2366 |
- |
2367 |
-@@ -2117,7 +2141,7 @@ |
2368 |
- -L*) |
2369 |
- case " $tmp_libs " in |
2370 |
- *" $deplib "*) ;; |
2371 |
-- *) tmp_libs="$tmp_libs $deplib" ;; |
2372 |
-+ *) tmp_libs="$deplib $tmp_libs" ;; |
2373 |
- esac |
2374 |
- ;; |
2375 |
- *) tmp_libs="$tmp_libs $deplib" ;; |
2376 |
diff --git a/eclass/ELT-patches/fix-relink/1.4.3 b/eclass/ELT-patches/fix-relink/1.4.3 |
2377 |
deleted file mode 100644 |
2378 |
index 959fe1dd76f6..000000000000 |
2379 |
--- a/eclass/ELT-patches/fix-relink/1.4.3 |
2380 |
+++ /dev/null |
2381 |
@@ -1,62 +0,0 @@ |
2382 |
---- ltmain.sh 2003-09-24 19:48:39.367370072 +0200 |
2383 |
-+++ ltmain.sh 2003-09-24 19:49:31.773403144 +0200 |
2384 |
-@@ -1593,6 +1593,8 @@ |
2385 |
- convenience="$convenience $ladir/$objdir/$old_library" |
2386 |
- old_convenience="$old_convenience $ladir/$objdir/$old_library" |
2387 |
- tmp_libs= |
2388 |
-+ # PKGW |
2389 |
-+ dependency_libs= |
2390 |
- for deplib in $dependency_libs; do |
2391 |
- deplibs="$deplib $deplibs" |
2392 |
- if test "X$duplicate_deps" = "Xyes" ; then |
2393 |
-@@ -1710,6 +1712,8 @@ |
2394 |
- fi |
2395 |
- |
2396 |
- tmp_libs= |
2397 |
-+ #PKGW |
2398 |
-+ dependency_libs= |
2399 |
- for deplib in $dependency_libs; do |
2400 |
- case $deplib in |
2401 |
- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
2402 |
-@@ -1871,6 +1875,16 @@ |
2403 |
- add="$dir/$linklib" |
2404 |
- elif test "$hardcode_minus_L" = yes; then |
2405 |
- add_dir="-L$dir" |
2406 |
-+ # Try looking first in the location we're being installed to. |
2407 |
-+ if test -n "$inst_prefix_dir"; then |
2408 |
-+ case "$libdir" in |
2409 |
-+ [\\/]*) |
2410 |
-+ # Add the install location to the beginning, minimising possiblilty |
2411 |
-+ # of linking to older version of the lib already installed. |
2412 |
-+ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
2413 |
-+ ;; |
2414 |
-+ esac |
2415 |
-+ fi |
2416 |
- add="-l$name" |
2417 |
- elif test "$hardcode_shlibpath_var" = yes; then |
2418 |
- add_shlibpath="$dir" |
2419 |
-@@ -1938,11 +1952,13 @@ |
2420 |
- else |
2421 |
- # We cannot seem to hardcode it, guess we'll fake it. |
2422 |
- # Try looking first in the location we're being installed to. |
2423 |
-- add_dir= |
2424 |
-+ add_dir="-L$dir" |
2425 |
- if test -n "$inst_prefix_dir"; then |
2426 |
- case "$libdir" in |
2427 |
- [\\/]*) |
2428 |
-- add_dir="-L$inst_prefix_dir$libdir" |
2429 |
-+ # Add the install location to the beginning, minimising possiblilty |
2430 |
-+ # of linking to older version of the lib already installed. |
2431 |
-+ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
2432 |
- ;; |
2433 |
- esac |
2434 |
- fi |
2435 |
-@@ -2146,7 +2162,7 @@ |
2436 |
- -L*) |
2437 |
- case " $tmp_libs " in |
2438 |
- *" $deplib "*) ;; |
2439 |
-- *) tmp_libs="$tmp_libs $deplib" ;; |
2440 |
-+ *) tmp_libs="$deplib $tmp_libs" ;; |
2441 |
- esac |
2442 |
- ;; |
2443 |
- *) tmp_libs="$tmp_libs $deplib" ;; |
2444 |
diff --git a/eclass/ELT-patches/fix-relink/1.5.0 b/eclass/ELT-patches/fix-relink/1.5.0 |
2445 |
deleted file mode 100644 |
2446 |
index 29b7db7b1dd4..000000000000 |
2447 |
--- a/eclass/ELT-patches/fix-relink/1.5.0 |
2448 |
+++ /dev/null |
2449 |
@@ -1,51 +0,0 @@ |
2450 |
---- ltmain.sh 2003-09-24 18:18:14.961005184 +0200 |
2451 |
-+++ ltmain.sh 2003-09-24 18:20:11.204333512 +0200 |
2452 |
-@@ -2022,6 +2022,8 @@ |
2453 |
- convenience="$convenience $ladir/$objdir/$old_library" |
2454 |
- old_convenience="$old_convenience $ladir/$objdir/$old_library" |
2455 |
- tmp_libs= |
2456 |
-+ # PKGW |
2457 |
-+ dependency_libs= |
2458 |
- for deplib in $dependency_libs; do |
2459 |
- deplibs="$deplib $deplibs" |
2460 |
- if test "X$duplicate_deps" = "Xyes" ; then |
2461 |
-@@ -2143,6 +2145,8 @@ |
2462 |
- fi |
2463 |
- |
2464 |
- tmp_libs= |
2465 |
-+ #PKGW |
2466 |
-+ dependency_libs= |
2467 |
- for deplib in $dependency_libs; do |
2468 |
- case $deplib in |
2469 |
- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
2470 |
-@@ -2359,7 +2363,9 @@ |
2471 |
- if test -n "$inst_prefix_dir"; then |
2472 |
- case "$libdir" in |
2473 |
- [\\/]*) |
2474 |
-- add_dir="$add_dir -L$inst_prefix_dir$libdir" |
2475 |
-+ # Add the install location to the beginning, minimising possiblilty |
2476 |
-+ # of linking to older version of the lib already installed. |
2477 |
-+ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
2478 |
- ;; |
2479 |
- esac |
2480 |
- fi |
2481 |
-@@ -2431,7 +2437,9 @@ |
2482 |
- if test -n "$inst_prefix_dir"; then |
2483 |
- case "$libdir" in |
2484 |
- [\\/]*) |
2485 |
-- add_dir="$add_dir -L$inst_prefix_dir$libdir" |
2486 |
-+ # Add the install location to the beginning, minimising possiblilty |
2487 |
-+ # of linking to older version of the lib already installed. |
2488 |
-+ add_dir="-L$inst_prefix_dir$libdir $add_dir" |
2489 |
- ;; |
2490 |
- esac |
2491 |
- fi |
2492 |
-@@ -2691,7 +2699,7 @@ |
2493 |
- -L*) |
2494 |
- case " $tmp_libs " in |
2495 |
- *" $deplib "*) ;; |
2496 |
-- *) tmp_libs="$tmp_libs $deplib" ;; |
2497 |
-+ *) tmp_libs="$deplib $tmp_libs" ;; |
2498 |
- esac |
2499 |
- ;; |
2500 |
- *) tmp_libs="$tmp_libs $deplib" ;; |
2501 |
diff --git a/eclass/ELT-patches/gold-conf/2.2.6 b/eclass/ELT-patches/gold-conf/2.2.6 |
2502 |
deleted file mode 100644 |
2503 |
index 048cbad01187..000000000000 |
2504 |
--- a/eclass/ELT-patches/gold-conf/2.2.6 |
2505 |
+++ /dev/null |
2506 |
@@ -1,10 +0,0 @@ |
2507 |
---- configure.orig |
2508 |
-+++ configure |
2509 |
-@@ -9933,6 +9933,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
2510 |
- fi |
2511 |
- supports_anon_versioning=no |
2512 |
- case `$LD -v 2>&1` in |
2513 |
-+ *GNU\ gold*) supports_anon_versioning=yes ;; |
2514 |
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 |
2515 |
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
2516 |
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
2517 |
diff --git a/eclass/ELT-patches/hardcode-relink/1.3d b/eclass/ELT-patches/hardcode-relink/1.3d |
2518 |
deleted file mode 100644 |
2519 |
index dc7819f447e3..000000000000 |
2520 |
--- a/eclass/ELT-patches/hardcode-relink/1.3d |
2521 |
+++ /dev/null |
2522 |
@@ -1,8 +0,0 @@ |
2523 |
---- ltmain.sh |
2524 |
-+++ ltmain.sh |
2525 |
-@@ -2208,4 +2208,4 @@ |
2526 |
- relink) |
2527 |
-- if test "$hardcode_direct" = yes; then |
2528 |
-+ if false && test "$hardcode_direct" = yes; then |
2529 |
- add="$dir/$linklib" |
2530 |
- elif test "$hardcode_minus_L" = yes; then |
2531 |
diff --git a/eclass/ELT-patches/hardcode/1.3d b/eclass/ELT-patches/hardcode/1.3d |
2532 |
deleted file mode 100644 |
2533 |
index 7408b372aec7..000000000000 |
2534 |
--- a/eclass/ELT-patches/hardcode/1.3d |
2535 |
+++ /dev/null |
2536 |
@@ -1,21 +0,0 @@ |
2537 |
-http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html |
2538 |
- |
2539 |
-but this patch disables hardcoding independent of inst_prefix_dir at all, |
2540 |
-for both hardcode_direct=yes and hardcode_minus_L=yes. |
2541 |
- |
2542 |
-If you update this patch, please also update libtool/files/libtool-1.3d-hardcode.patch |
2543 |
- |
2544 |
---- ltmain.in.orig 2008-04-16 15:54:04.000000000 +0200 |
2545 |
-+++ ltmain.in 2008-04-16 16:21:04.000000000 +0200 |
2546 |
-@@ -1900,9 +1900,9 @@ |
2547 |
- add_dir= |
2548 |
- add= |
2549 |
- # Finalize command for both is simple: just hardcode it. |
2550 |
-- if test "$hardcode_direct" = yes; then |
2551 |
-+ if false && test "$hardcode_direct" = yes; then |
2552 |
- add="$libdir/$linklib" |
2553 |
-- elif test "$hardcode_minus_L" = yes; then |
2554 |
-+ elif false && test "$hardcode_minus_L" = yes; then |
2555 |
- add_dir="-L$libdir" |
2556 |
- add="-l$name" |
2557 |
- elif test "$hardcode_shlibpath_var" = yes; then |
2558 |
diff --git a/eclass/ELT-patches/hardcode/2.1b b/eclass/ELT-patches/hardcode/2.1b |
2559 |
deleted file mode 100644 |
2560 |
index 48571f39379f..000000000000 |
2561 |
--- a/eclass/ELT-patches/hardcode/2.1b |
2562 |
+++ /dev/null |
2563 |
@@ -1,36 +0,0 @@ |
2564 |
-Hardcoding library path does not work with DESTDIR installs. |
2565 |
- |
2566 |
-Affects any platform with 'hardcode_direct=yes' or 'hardcode_minus_L=yes'. |
2567 |
-According to libtool.m4 (as of libtool-1.5.26), these are: |
2568 |
- *-aix* |
2569 |
- *-hpux9 |
2570 |
- hppa-hpux* (not hppa64 or ia64) |
2571 |
- *-netbsd |
2572 |
- *-openbsd |
2573 |
- *-freebsd |
2574 |
- *-dragonfly |
2575 |
- *-newsos6 |
2576 |
- *-os2 |
2577 |
- *-amigaos |
2578 |
- *-sunos4 |
2579 |
- *-sysv4 |
2580 |
-It definitely is required for aix (to support DESTDIR), |
2581 |
-although it should help for others too... |
2582 |
- |
2583 |
---- ../../libtool.orig 2009-07-16 18:06:59 +0200 |
2584 |
-+++ ../../libtool 2009-07-16 18:07:45 +0200 |
2585 |
-@@ -6298,13 +6298,13 @@ |
2586 |
- add_dir= |
2587 |
- add= |
2588 |
- # Finalize command for both is simple: just hardcode it. |
2589 |
- if test "$hardcode_direct" = yes && |
2590 |
- test "$hardcode_direct_absolute" = no; then |
2591 |
- add="$libdir/$linklib" |
2592 |
-- elif test "$hardcode_minus_L" = yes; then |
2593 |
-+ elif false && test "$hardcode_minus_L" = yes; then |
2594 |
- add_dir="-L$libdir" |
2595 |
- add="-l$name" |
2596 |
- elif test "$hardcode_shlibpath_var" = yes; then |
2597 |
- case :$finalize_shlibpath: in |
2598 |
- *":$libdir:"*) ;; |
2599 |
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; |
2600 |
diff --git a/eclass/ELT-patches/hc-flag-ld/1.5 b/eclass/ELT-patches/hc-flag-ld/1.5 |
2601 |
deleted file mode 100644 |
2602 |
index bf88873c8f16..000000000000 |
2603 |
--- a/eclass/ELT-patches/hc-flag-ld/1.5 |
2604 |
+++ /dev/null |
2605 |
@@ -1,18 +0,0 @@ |
2606 |
-http://lists.gnu.org/archive/html/libtool/2006-01/msg00012.html |
2607 |
- |
2608 |
---- ltmain.sh.orig 2007-11-19 17:07:34.946648000 +0100 |
2609 |
-+++ ltmain.sh 2007-11-19 17:07:57.785975000 +0100 |
2610 |
-@@ -3915,8 +3915,11 @@ |
2611 |
- test -n "$hardcode_libdirs"; then |
2612 |
- libdir="$hardcode_libdirs" |
2613 |
- if test -n "$hardcode_libdir_flag_spec_ld"; then |
2614 |
-- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" |
2615 |
-- else |
2616 |
-+ case $archive_cmds in |
2617 |
-+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; |
2618 |
-+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; |
2619 |
-+ esac |
2620 |
-+ else |
2621 |
- eval dep_rpath=\"$hardcode_libdir_flag_spec\" |
2622 |
- fi |
2623 |
- fi |
2624 |
diff --git a/eclass/ELT-patches/hpux-conf/1.5.22-syslibpath b/eclass/ELT-patches/hpux-conf/1.5.22-syslibpath |
2625 |
deleted file mode 100644 |
2626 |
index 27fef4873ead..000000000000 |
2627 |
--- a/eclass/ELT-patches/hpux-conf/1.5.22-syslibpath |
2628 |
+++ /dev/null |
2629 |
@@ -1,24 +0,0 @@ |
2630 |
-must not search /usr/local in prefix |
2631 |
- |
2632 |
---- configure.orig 2007-12-02 19:14:55 +0100 |
2633 |
-+++ configure 2007-12-02 19:14:59 +0100 |
2634 |
-@@ -8920,9 +8920,17 @@ |
2635 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2636 |
- soname_spec='${libname}${release}${shared_ext}$major' |
2637 |
- if test "X$HPUX_IA64_MODE" = X32; then |
2638 |
-- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" |
2639 |
-+ if test "$GCC" = yes; then |
2640 |
-+ sys_lib_search_path_spec="${sys_lib_search_path_spec} /usr/lib/hpux32" |
2641 |
-+ else |
2642 |
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" |
2643 |
-+ fi |
2644 |
- else |
2645 |
-- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" |
2646 |
-+ if test "$GCC" = yes; then |
2647 |
-+ sys_lib_search_path_spec="${sys_lib_search_path_spec} /usr/lib/hpux64" |
2648 |
-+ else |
2649 |
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" |
2650 |
-+ fi |
2651 |
- fi |
2652 |
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
2653 |
- ;; |
2654 |
diff --git a/eclass/ELT-patches/install-sh/1.5 b/eclass/ELT-patches/install-sh/1.5 |
2655 |
deleted file mode 100644 |
2656 |
index 1b8b20bebdac..000000000000 |
2657 |
--- a/eclass/ELT-patches/install-sh/1.5 |
2658 |
+++ /dev/null |
2659 |
@@ -1,14 +0,0 @@ |
2660 |
---- install-sh 2007-07-04 14:36:49 +0100 |
2661 |
-+++ install-sh 2007-09-14 11:00:41 +0100 |
2662 |
-@@ -192,7 +192,10 @@ |
2663 |
- |
2664 |
- if [ x"$dir_arg" != x ] |
2665 |
- then |
2666 |
-- $doit $instcmd $dst && |
2667 |
-+ { $doit $instcmd "$dst" || lasterr=$? |
2668 |
-+ # It's ok for mkdir to fail if the directory already exists. |
2669 |
-+ test -d "$dst" || { (exit ${lasterr-1}); exit; } |
2670 |
-+ } && |
2671 |
- |
2672 |
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && |
2673 |
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && |
2674 |
diff --git a/eclass/ELT-patches/install-sh/1.5.4 b/eclass/ELT-patches/install-sh/1.5.4 |
2675 |
deleted file mode 100644 |
2676 |
index 0b1c22043bff..000000000000 |
2677 |
--- a/eclass/ELT-patches/install-sh/1.5.4 |
2678 |
+++ /dev/null |
2679 |
@@ -1,14 +0,0 @@ |
2680 |
---- install-sh 2006-03-25 20:04:46 +0000 |
2681 |
-+++ install-sh 2007-09-14 10:53:29 +0100 |
2682 |
-@@ -246,7 +246,10 @@ |
2683 |
- fi |
2684 |
- |
2685 |
- if test -n "$dir_arg"; then |
2686 |
-- $doit $mkdircmd "$dst" \ |
2687 |
-+ { $doit $mkdircmd "$dst" || lasterr=$? |
2688 |
-+ # It's ok for mkdir to fail if the directory already exists. |
2689 |
-+ test -d "$dst" || { (exit ${lasterr-1}); exit; } |
2690 |
-+ } \ |
2691 |
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ |
2692 |
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ |
2693 |
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ |
2694 |
diff --git a/eclass/ELT-patches/install-sh/1.5.6 b/eclass/ELT-patches/install-sh/1.5.6 |
2695 |
deleted file mode 100644 |
2696 |
index d107740d1b2c..000000000000 |
2697 |
--- a/eclass/ELT-patches/install-sh/1.5.6 |
2698 |
+++ /dev/null |
2699 |
@@ -1,14 +0,0 @@ |
2700 |
---- install-sh 2006-03-14 12:57:54 -0300 |
2701 |
-+++ install-sh 2008-06-19 22:23:04 -0300 |
2702 |
-@@ -240,7 +240,10 @@ |
2703 |
- fi |
2704 |
- |
2705 |
- if test -n "$dir_arg"; then |
2706 |
-- $doit $instcmd "$dst" \ |
2707 |
-+ { $doit $instcmd "$dst" || lasterr=$? |
2708 |
-+ # It's ok for mkdir to fail if the directory already exists. |
2709 |
-+ test -d "$dst" || { (exit ${lasterr-1}); exit; } |
2710 |
-+ } \ |
2711 |
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ |
2712 |
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ |
2713 |
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ |
2714 |
diff --git a/eclass/ELT-patches/irix-ltmain/2.2.6 b/eclass/ELT-patches/irix-ltmain/2.2.6 |
2715 |
deleted file mode 100644 |
2716 |
index 70916377b5e7..000000000000 |
2717 |
--- a/eclass/ELT-patches/irix-ltmain/2.2.6 |
2718 |
+++ /dev/null |
2719 |
@@ -1,30 +0,0 @@ |
2720 |
-I notice that $EPREFIX/usr/share/libtool/config/ltmain.sh also has this |
2721 |
-stray increment - so I'd assume that this is a bug in libtool (which is |
2722 |
-perhaps trying to fix a deprecated behaviour of old IRIX versions?). |
2723 |
- |
2724 |
-http://bugs.gentoo.org/show_bug.cgi?id=301520 |
2725 |
- |
2726 |
- |
2727 |
---- ltmain.sh.dist 2010-01-19 14:04:22.101603800 +0000 |
2728 |
-+++ ltmain.sh 2010-01-19 14:08:29.361500240 +0000 |
2729 |
-@@ -6225,7 +6225,6 @@ func_mode_link () |
2730 |
- current=$func_arith_result |
2731 |
- age="$number_minor" |
2732 |
- revision="$number_minor" |
2733 |
-- lt_irix_increment=no |
2734 |
- ;; |
2735 |
- esac |
2736 |
- ;; |
2737 |
-@@ -6297,11 +6296,7 @@ func_mode_link () |
2738 |
- ;; |
2739 |
- |
2740 |
- irix | nonstopux) |
2741 |
-- if test "X$lt_irix_increment" = "Xno"; then |
2742 |
-- func_arith $current - $age |
2743 |
-- else |
2744 |
-- func_arith $current - $age + 1 |
2745 |
-- fi |
2746 |
-+ func_arith $current - $age |
2747 |
- major=$func_arith_result |
2748 |
- |
2749 |
- case $version_type in |
2750 |
diff --git a/eclass/ELT-patches/ltmain/1.5 b/eclass/ELT-patches/ltmain/1.5 |
2751 |
deleted file mode 100644 |
2752 |
index 39abee03efa1..000000000000 |
2753 |
--- a/eclass/ELT-patches/ltmain/1.5 |
2754 |
+++ /dev/null |
2755 |
@@ -1,18 +0,0 @@ |
2756 |
---- ltmain.sh 2007-09-15 07:35:19 +0100 |
2757 |
-+++ ltmain.sh 2004-01-25 12:40:26 +0000 |
2758 |
-@@ -1854,6 +1840,15 @@ |
2759 |
- lib= |
2760 |
- found=no |
2761 |
- case $deplib in |
2762 |
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) |
2763 |
-+ if test "$linkmode,$pass" = "prog,link"; then |
2764 |
-+ compile_deplibs="$deplib $compile_deplibs" |
2765 |
-+ finalize_deplibs="$deplib $finalize_deplibs" |
2766 |
-+ else |
2767 |
-+ deplibs="$deplib $deplibs" |
2768 |
-+ fi |
2769 |
-+ continue |
2770 |
-+ ;; |
2771 |
- -l*) |
2772 |
- if test "$linkmode" != lib && test "$linkmode" != prog; then |
2773 |
- $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 |
2774 |
diff --git a/eclass/ELT-patches/max_cmd_len/1.5.0 b/eclass/ELT-patches/max_cmd_len/1.5.0 |
2775 |
deleted file mode 100644 |
2776 |
index 6d5f88b59669..000000000000 |
2777 |
--- a/eclass/ELT-patches/max_cmd_len/1.5.0 |
2778 |
+++ /dev/null |
2779 |
@@ -1,33 +0,0 @@ |
2780 |
---- ltmain.sh 2004-02-11 20:55:14.587581248 +0200 |
2781 |
-+++ ltmain.sh 2004-02-11 21:15:33.467283368 +0200 |
2782 |
-@@ -117,6 +117,30 @@ |
2783 |
- execute_dlfiles= |
2784 |
- lo2o="s/\\.lo\$/.${objext}/" |
2785 |
- o2lo="s/\\.${objext}\$/.lo/" |
2786 |
-+ |
2787 |
-+if test -z "$max_cmd_len"; then |
2788 |
-+ i=0 |
2789 |
-+ testring="ABCD" |
2790 |
-+ new_result= |
2791 |
-+ |
2792 |
-+ # If test is not a shell built-in, we'll probably end up computing a |
2793 |
-+ # maximum length that is only half of the actual maximum length, but |
2794 |
-+ # we can't tell. |
2795 |
-+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ |
2796 |
-+ = "XX$testring") >/dev/null 2>&1 && |
2797 |
-+ new_result=`expr "X$testring" : ".*" 2>&1` && |
2798 |
-+ max_cmd_len="$new_result" && |
2799 |
-+ test $i != 17 # 1/2 MB should be enough |
2800 |
-+ do |
2801 |
-+ i=`expr $i + 1` |
2802 |
-+ testring="$testring$testring" |
2803 |
-+ done |
2804 |
-+ testring= |
2805 |
-+ # Add a significant safety factor because C++ compilers can tack on massive |
2806 |
-+ # amounts of additional arguments before passing them to the linker. |
2807 |
-+ # It appears as though 1/2 is a usable value. |
2808 |
-+ max_cmd_len=`expr $max_cmd_len \/ 2` |
2809 |
-+fi |
2810 |
- |
2811 |
- ##################################### |
2812 |
- # Shell function definitions: |
2813 |
diff --git a/eclass/ELT-patches/max_cmd_len/1.5.14 b/eclass/ELT-patches/max_cmd_len/1.5.14 |
2814 |
deleted file mode 100644 |
2815 |
index 8f299e8b9560..000000000000 |
2816 |
--- a/eclass/ELT-patches/max_cmd_len/1.5.14 |
2817 |
+++ /dev/null |
2818 |
@@ -1,33 +0,0 @@ |
2819 |
---- ltmain.sh |
2820 |
-+++ ltmain.sh |
2821 |
-@@ -136,6 +136,30 @@ |
2822 |
- lo2o="s/\\.lo\$/.${objext}/" |
2823 |
- o2lo="s/\\.${objext}\$/.lo/" |
2824 |
- quote_scanset='[[~#^*{};<>?'"'"' ]' |
2825 |
-+ |
2826 |
-+if test -z "$max_cmd_len"; then |
2827 |
-+ i=0 |
2828 |
-+ testring="ABCD" |
2829 |
-+ new_result= |
2830 |
-+ |
2831 |
-+ # If test is not a shell built-in, we'll probably end up computing a |
2832 |
-+ # maximum length that is only half of the actual maximum length, but |
2833 |
-+ # we can't tell. |
2834 |
-+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ |
2835 |
-+ = "XX$testring") >/dev/null 2>&1 && |
2836 |
-+ new_result=`expr "X$testring" : ".*" 2>&1` && |
2837 |
-+ max_cmd_len="$new_result" && |
2838 |
-+ test "$i" != 17 # 1/2 MB should be enough |
2839 |
-+ do |
2840 |
-+ i=`expr $i + 1` |
2841 |
-+ testring="$testring$testring" |
2842 |
-+ done |
2843 |
-+ testring= |
2844 |
-+ # Add a significant safety factor because C++ compilers can tack on massive |
2845 |
-+ # amounts of additional arguments before passing them to the linker. |
2846 |
-+ # It appears as though 1/2 is a usable value. |
2847 |
-+ max_cmd_len=`expr $max_cmd_len \/ 2` |
2848 |
-+fi |
2849 |
- |
2850 |
- ##################################### |
2851 |
- # Shell function definitions: |
2852 |
diff --git a/eclass/ELT-patches/max_cmd_len/1.5.20 b/eclass/ELT-patches/max_cmd_len/1.5.20 |
2853 |
deleted file mode 100644 |
2854 |
index 76dc21364a54..000000000000 |
2855 |
--- a/eclass/ELT-patches/max_cmd_len/1.5.20 |
2856 |
+++ /dev/null |
2857 |
@@ -1,33 +0,0 @@ |
2858 |
---- ltmain.sh |
2859 |
-+++ ltmain.sh |
2860 |
-@@ -136,6 +136,30 @@ |
2861 |
- execute_dlfiles= |
2862 |
- lo2o="s/\\.lo\$/.${objext}/" |
2863 |
- o2lo="s/\\.${objext}\$/.lo/" |
2864 |
-+ |
2865 |
-+if test -z "$max_cmd_len"; then |
2866 |
-+ i=0 |
2867 |
-+ testring="ABCD" |
2868 |
-+ new_result= |
2869 |
-+ |
2870 |
-+ # If test is not a shell built-in, we'll probably end up computing a |
2871 |
-+ # maximum length that is only half of the actual maximum length, but |
2872 |
-+ # we can't tell. |
2873 |
-+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ |
2874 |
-+ = "XX$testring") >/dev/null 2>&1 && |
2875 |
-+ new_result=`expr "X$testring" : ".*" 2>&1` && |
2876 |
-+ max_cmd_len="$new_result" && |
2877 |
-+ test "$i" != 17 # 1/2 MB should be enough |
2878 |
-+ do |
2879 |
-+ i=`expr $i + 1` |
2880 |
-+ testring="$testring$testring" |
2881 |
-+ done |
2882 |
-+ testring= |
2883 |
-+ # Add a significant safety factor because C++ compilers can tack on massive |
2884 |
-+ # amounts of additional arguments before passing them to the linker. |
2885 |
-+ # It appears as though 1/2 is a usable value. |
2886 |
-+ max_cmd_len=`expr $max_cmd_len \/ 2` |
2887 |
-+fi |
2888 |
- |
2889 |
- ##################################### |
2890 |
- # Shell function definitions: |
2891 |
diff --git a/eclass/ELT-patches/mint-conf/2.2.6 b/eclass/ELT-patches/mint-conf/2.2.6 |
2892 |
deleted file mode 100644 |
2893 |
index 34f2e5f28c59..000000000000 |
2894 |
--- a/eclass/ELT-patches/mint-conf/2.2.6 |
2895 |
+++ /dev/null |
2896 |
@@ -1,15 +0,0 @@ |
2897 |
-Calculating the max args here takes hours. |
2898 |
- |
2899 |
---- configure |
2900 |
-+++ configure |
2901 |
-@@ -7351,6 +7351,10 @@ |
2902 |
- lt_cv_sys_max_cmd_len=8192; |
2903 |
- ;; |
2904 |
- |
2905 |
-+ mint*) |
2906 |
-+ lt_cv_sys_max_cmd_len=8192; |
2907 |
-+ ;; |
2908 |
-+ |
2909 |
- amigaos*) |
2910 |
- # On AmigaOS with pdksh, this test takes hours, literally. |
2911 |
- # So we just punt and use a minimum line length of 8192. |
2912 |
diff --git a/eclass/ELT-patches/no-lc/1.3d b/eclass/ELT-patches/no-lc/1.3d |
2913 |
deleted file mode 100644 |
2914 |
index de20b0ceed3c..000000000000 |
2915 |
--- a/eclass/ELT-patches/no-lc/1.3d |
2916 |
+++ /dev/null |
2917 |
@@ -1,13 +0,0 @@ |
2918 |
---- release-1-3d.orig 2009-12-03 17:05:15.608916799 +0100 |
2919 |
-+++ release-1-3d 2009-12-14 22:01:06.634927600 +0100 |
2920 |
-@@ -1035,6 +1035,10 @@ |
2921 |
- esac |
2922 |
- elif test "$arg" = "-lm"; then |
2923 |
- case $host in |
2924 |
-+ *-*-hpux*) |
2925 |
-+ # Compiler inserts libc in the correct place for threads to work |
2926 |
-+ test "X$arg" = "X-lc" && continue |
2927 |
-+ ;; |
2928 |
- *-*-cygwin* | *-*-pw32* | *-*-beos*) |
2929 |
- # These systems don't actually have math library (as such) |
2930 |
- continue |
2931 |
diff --git a/eclass/ELT-patches/no-lc/1.5.22 b/eclass/ELT-patches/no-lc/1.5.22 |
2932 |
deleted file mode 100644 |
2933 |
index 786284d49744..000000000000 |
2934 |
--- a/eclass/ELT-patches/no-lc/1.5.22 |
2935 |
+++ /dev/null |
2936 |
@@ -1,11 +0,0 @@ |
2937 |
---- release-1-5-22.orig 2009-12-03 17:05:15.605534999 +0100 |
2938 |
-+++ release-1-5-22 2009-12-14 21:56:58.884956366 +0100 |
2939 |
-@@ -1573,7 +1573,7 @@ |
2940 |
- # Causes problems with __ctype |
2941 |
- test "X$arg" = "X-lc" && continue |
2942 |
- ;; |
2943 |
-- *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) |
2944 |
-+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX* | *-*-hpux*) |
2945 |
- # Compiler inserts libc in the correct place for threads to work |
2946 |
- test "X$arg" = "X-lc" && continue |
2947 |
- ;; |
2948 |
diff --git a/eclass/ELT-patches/portage/1.2.0 b/eclass/ELT-patches/portage/1.2.0 |
2949 |
deleted file mode 100644 |
2950 |
index 70b02619c601..000000000000 |
2951 |
--- a/eclass/ELT-patches/portage/1.2.0 |
2952 |
+++ /dev/null |
2953 |
@@ -1,7 +0,0 @@ |
2954 |
-# Dummy patch, not needed by libtool-1.2 |
2955 |
- |
2956 |
---- ltmain.sh |
2957 |
-+++ ltmain.sh |
2958 |
-@@ -32,1 +32,1 @@ |
2959 |
--PACKAGE=libtool |
2960 |
-+PACKAGE=libtool |
2961 |
diff --git a/eclass/ELT-patches/portage/1.3.0c b/eclass/ELT-patches/portage/1.3.0c |
2962 |
deleted file mode 100644 |
2963 |
index ad071aed2f08..000000000000 |
2964 |
--- a/eclass/ELT-patches/portage/1.3.0c |
2965 |
+++ /dev/null |
2966 |
@@ -1,66 +0,0 @@ |
2967 |
---- ltmain.sh 2005-09-02 22:19:17.000000000 +0200 |
2968 |
-+++ ltmain.sh 2005-09-02 22:20:55.000000000 +0200 |
2969 |
-@@ -3769,9 +3769,50 @@ |
2970 |
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
2971 |
- exit 1 |
2972 |
- fi |
2973 |
-- newdependency_libs="$newdependency_libs $libdir/$name" |
2974 |
-+ # We do not want portage's install root ($D) present. Check only for |
2975 |
-+ # this if the .la is being installed. |
2976 |
-+ if test "$installed" = yes && test "$D"; then |
2977 |
-+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
2978 |
-+ else |
2979 |
-+ mynewdependency_lib="$libdir/$name" |
2980 |
-+ fi |
2981 |
-+ # Do not add duplicates |
2982 |
-+ if test "$mynewdependency_lib"; then |
2983 |
-+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
2984 |
-+ if test -z "$my_little_ninja_foo_1"; then |
2985 |
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
2986 |
-+ fi |
2987 |
-+ fi |
2988 |
-+ ;; |
2989 |
-+ *) |
2990 |
-+ if test "$installed" = yes; then |
2991 |
-+ # Rather use S=WORKDIR if our version of portage supports it. |
2992 |
-+ # This is because some ebuild (gcc) do not use $S as buildroot. |
2993 |
-+ if test "$WORKDIR"; then |
2994 |
-+ S="$WORKDIR" |
2995 |
-+ fi |
2996 |
-+ # We do not want portage's build root ($S) present. |
2997 |
-+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
2998 |
-+ # We do not want portage's install root ($D) present. |
2999 |
-+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
3000 |
-+ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
3001 |
-+ mynewdependency_lib="" |
3002 |
-+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
3003 |
-+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3004 |
-+ else |
3005 |
-+ mynewdependency_lib="$deplib" |
3006 |
-+ fi |
3007 |
-+ else |
3008 |
-+ mynewdependency_lib="$deplib" |
3009 |
-+ fi |
3010 |
-+ # Do not add duplicates |
3011 |
-+ if test "$mynewdependency_lib"; then |
3012 |
-+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
3013 |
-+ if test -z "$my_little_ninja_foo_4"; then |
3014 |
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
3015 |
-+ fi |
3016 |
-+ fi |
3017 |
- ;; |
3018 |
-- *) newdependency_libs="$newdependency_libs $deplib" ;; |
3019 |
- esac |
3020 |
- done |
3021 |
- dependency_libs="$newdependency_libs" |
3022 |
-@@ -3799,6 +3840,10 @@ |
3023 |
- dlprefiles="$newdlprefiles" |
3024 |
- fi |
3025 |
- $rm $output |
3026 |
-+ # Do not add duplicates |
3027 |
-+ if test "$installed" = yes && test "$D"; then |
3028 |
-+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3029 |
-+ fi |
3030 |
- $echo > $output "\ |
3031 |
- # $outputname - a libtool library file |
3032 |
- # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP |
3033 |
diff --git a/eclass/ELT-patches/portage/1.3.3 b/eclass/ELT-patches/portage/1.3.3 |
3034 |
deleted file mode 100644 |
3035 |
index 731076bce485..000000000000 |
3036 |
--- a/eclass/ELT-patches/portage/1.3.3 |
3037 |
+++ /dev/null |
3038 |
@@ -1,71 +0,0 @@ |
3039 |
---- ltmain.sh 2005-05-13 10:53:28.000000000 +0200 |
3040 |
-+++ ltmain.sh 2005-05-13 11:44:15.000000000 +0200 |
3041 |
-@@ -3078,6 +3078,68 @@ |
3042 |
- break |
3043 |
- fi |
3044 |
- output="$output_objdir/$outputname"i |
3045 |
-+ # Replace all uninstalled libtool libraries with the installed ones |
3046 |
-+ newdependency_libs= |
3047 |
-+ for deplib in $dependency_libs; do |
3048 |
-+ case $deplib in |
3049 |
-+ *.la) |
3050 |
-+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` |
3051 |
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
3052 |
-+ if test -z "$libdir"; then |
3053 |
-+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
3054 |
-+ exit $EXIT_FAILURE |
3055 |
-+ fi |
3056 |
-+ # We do not want portage's install root ($D) present. Check only for |
3057 |
-+ # this if the .la is being installed. |
3058 |
-+ if test "$installed" = yes && test "$D"; then |
3059 |
-+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3060 |
-+ else |
3061 |
-+ mynewdependency_lib="$libdir/$name" |
3062 |
-+ fi |
3063 |
-+ # Do not add duplicates |
3064 |
-+ if test "$mynewdependency_lib"; then |
3065 |
-+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
3066 |
-+ if test -z "$my_little_ninja_foo_1"; then |
3067 |
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
3068 |
-+ fi |
3069 |
-+ fi |
3070 |
-+ ;; |
3071 |
-+ *) |
3072 |
-+ if test "$installed" = yes; then |
3073 |
-+ # Rather use S=WORKDIR if our version of portage supports it. |
3074 |
-+ # This is because some ebuild (gcc) do not use $S as buildroot. |
3075 |
-+ if test "$WORKDIR"; then |
3076 |
-+ S="$WORKDIR" |
3077 |
-+ fi |
3078 |
-+ # We do not want portage's build root ($S) present. |
3079 |
-+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
3080 |
-+ # We do not want portage's install root ($D) present. |
3081 |
-+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
3082 |
-+ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
3083 |
-+ mynewdependency_lib="" |
3084 |
-+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
3085 |
-+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3086 |
-+ else |
3087 |
-+ mynewdependency_lib="$deplib" |
3088 |
-+ fi |
3089 |
-+ else |
3090 |
-+ mynewdependency_lib="$deplib" |
3091 |
-+ fi |
3092 |
-+ # Do not add duplicates |
3093 |
-+ if test "$mynewdependency_lib"; then |
3094 |
-+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
3095 |
-+ if test -z "$my_little_ninja_foo_4"; then |
3096 |
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
3097 |
-+ fi |
3098 |
-+ fi |
3099 |
-+ ;; |
3100 |
-+ esac |
3101 |
-+ done |
3102 |
-+ dependency_libs="$newdependency_libs" |
3103 |
-+ fi |
3104 |
-+ # Do not add duplicates |
3105 |
-+ if test "$installed" = yes && test "$D"; then |
3106 |
-+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3107 |
- fi |
3108 |
- $rm $output |
3109 |
- $echo > $output "\ |
3110 |
diff --git a/eclass/ELT-patches/portage/1.4.0 b/eclass/ELT-patches/portage/1.4.0 |
3111 |
deleted file mode 100644 |
3112 |
index 5566a39af49a..000000000000 |
3113 |
--- a/eclass/ELT-patches/portage/1.4.0 |
3114 |
+++ /dev/null |
3115 |
@@ -1,74 +0,0 @@ |
3116 |
-Note that if you update this patch, please update this one as well: |
3117 |
- |
3118 |
- eclass/ELT-patches/portage/1.4.1 |
3119 |
- |
3120 |
-The file name can stay 1.4.1, as it will still apply to all versions. Only |
3121 |
-when a new version of libtool comes out that it do not apply to, then the |
3122 |
-name should be bumped, but the patch content should stay fairly the same. |
3123 |
- |
3124 |
---- ltmain.sh Wed Apr 3 01:19:37 2002 |
3125 |
-+++ ltmain.sh Sun May 26 19:50:52 2002 |
3126 |
-@@ -3940,9 +3940,50 @@ |
3127 |
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
3128 |
- exit 1 |
3129 |
- fi |
3130 |
-- newdependency_libs="$newdependency_libs $libdir/$name" |
3131 |
-+ # We do not want portage's install root ($D) present. Check only for |
3132 |
-+ # this if the .la is being installed. |
3133 |
-+ if test "$installed" = yes && test "$D"; then |
3134 |
-+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3135 |
-+ else |
3136 |
-+ mynewdependency_lib="$libdir/$name" |
3137 |
-+ fi |
3138 |
-+ # Do not add duplicates |
3139 |
-+ if test "$mynewdependency_lib"; then |
3140 |
-+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
3141 |
-+ if test -z "$my_little_ninja_foo_1"; then |
3142 |
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
3143 |
-+ fi |
3144 |
-+ fi |
3145 |
-+ ;; |
3146 |
-+ *) |
3147 |
-+ if test "$installed" = yes; then |
3148 |
-+ # Rather use S=WORKDIR if our version of portage supports it. |
3149 |
-+ # This is because some ebuild (gcc) do not use $S as buildroot. |
3150 |
-+ if test "$WORKDIR"; then |
3151 |
-+ S="$WORKDIR" |
3152 |
-+ fi |
3153 |
-+ # We do not want portage's build root ($S) present. |
3154 |
-+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
3155 |
-+ # We do not want portage's install root ($D) present. |
3156 |
-+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
3157 |
-+ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
3158 |
-+ mynewdependency_lib="" |
3159 |
-+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
3160 |
-+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3161 |
-+ else |
3162 |
-+ mynewdependency_lib="$deplib" |
3163 |
-+ fi |
3164 |
-+ else |
3165 |
-+ mynewdependency_lib="$deplib" |
3166 |
-+ fi |
3167 |
-+ # Do not add duplicates |
3168 |
-+ if test "$mynewdependency_lib"; then |
3169 |
-+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
3170 |
-+ if test -z "$my_little_ninja_foo_4"; then |
3171 |
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
3172 |
-+ fi |
3173 |
-+ fi |
3174 |
- ;; |
3175 |
-- *) newdependency_libs="$newdependency_libs $deplib" ;; |
3176 |
- esac |
3177 |
- done |
3178 |
- dependency_libs="$newdependency_libs" |
3179 |
-@@ -3975,6 +4005,10 @@ |
3180 |
- case $host,$output,$installed,$module,$dlname in |
3181 |
- *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; |
3182 |
- esac |
3183 |
-+ # Do not add duplicates |
3184 |
-+ if test "$installed" = yes && test "$D"; then |
3185 |
-+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3186 |
-+ fi |
3187 |
- $echo > $output "\ |
3188 |
- # $outputname - a libtool library file |
3189 |
- # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP |
3190 |
diff --git a/eclass/ELT-patches/portage/1.5.10 b/eclass/ELT-patches/portage/1.5.10 |
3191 |
deleted file mode 100644 |
3192 |
index f33d906ed519..000000000000 |
3193 |
--- a/eclass/ELT-patches/portage/1.5.10 |
3194 |
+++ /dev/null |
3195 |
@@ -1,77 +0,0 @@ |
3196 |
-Note that if you update this patch, please update this one as well: |
3197 |
- |
3198 |
- eclass/ELT-patches/portage/1.4.1 |
3199 |
- |
3200 |
-The file name can stay 1.4.1, as it will still apply to all versions. Only |
3201 |
-when a new version of libtool comes out that it do not apply to, then the |
3202 |
-name should be bumped, but the patch content should stay fairly the same. |
3203 |
- |
3204 |
---- ltmain.sh Wed Apr 3 01:19:37 2002 |
3205 |
-+++ ltmain.sh Sun May 26 19:50:52 2002 |
3206 |
-@@ -3940,9 +3940,53 @@ |
3207 |
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
3208 |
- exit 1 |
3209 |
- fi |
3210 |
-- newdependency_libs="$newdependency_libs $libdir/$name" |
3211 |
-+ if test "x$EGREP" = x ; then |
3212 |
-+ EGREP=egrep |
3213 |
-+ fi |
3214 |
-+ # We do not want portage's install root ($D) present. Check only for |
3215 |
-+ # this if the .la is being installed. |
3216 |
-+ if test "$installed" = yes && test "$D"; then |
3217 |
-+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3218 |
-+ else |
3219 |
-+ mynewdependency_lib="$libdir/$name" |
3220 |
-+ fi |
3221 |
-+ # Do not add duplicates |
3222 |
-+ if test "$mynewdependency_lib"; then |
3223 |
-+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
3224 |
-+ if test -z "$my_little_ninja_foo_1"; then |
3225 |
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
3226 |
-+ fi |
3227 |
-+ fi |
3228 |
-+ ;; |
3229 |
-+ *) |
3230 |
-+ if test "$installed" = yes; then |
3231 |
-+ # Rather use S=WORKDIR if our version of portage supports it. |
3232 |
-+ # This is because some ebuild (gcc) do not use $S as buildroot. |
3233 |
-+ if test "$WORKDIR"; then |
3234 |
-+ S="$WORKDIR" |
3235 |
-+ fi |
3236 |
-+ # We do not want portage's build root ($S) present. |
3237 |
-+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
3238 |
-+ # We do not want portage's install root ($D) present. |
3239 |
-+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
3240 |
-+ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
3241 |
-+ mynewdependency_lib="" |
3242 |
-+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
3243 |
-+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3244 |
-+ else |
3245 |
-+ mynewdependency_lib="$deplib" |
3246 |
-+ fi |
3247 |
-+ else |
3248 |
-+ mynewdependency_lib="$deplib" |
3249 |
-+ fi |
3250 |
-+ # Do not add duplicates |
3251 |
-+ if test "$mynewdependency_lib"; then |
3252 |
-+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
3253 |
-+ if test -z "$my_little_ninja_foo_4"; then |
3254 |
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
3255 |
-+ fi |
3256 |
-+ fi |
3257 |
- ;; |
3258 |
-- *) newdependency_libs="$newdependency_libs $deplib" ;; |
3259 |
- esac |
3260 |
- done |
3261 |
- dependency_libs="$newdependency_libs" |
3262 |
-@@ -3975,6 +4005,10 @@ |
3263 |
- case $host,$output,$installed,$module,$dlname in |
3264 |
- *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; |
3265 |
- esac |
3266 |
-+ # Do not add duplicates |
3267 |
-+ if test "$installed" = yes && test "$D"; then |
3268 |
-+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3269 |
-+ fi |
3270 |
- $echo > $output "\ |
3271 |
- # $outputname - a libtool library file |
3272 |
- # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP |
3273 |
diff --git a/eclass/ELT-patches/portage/2.2 b/eclass/ELT-patches/portage/2.2 |
3274 |
deleted file mode 100644 |
3275 |
index 1f724e7984eb..000000000000 |
3276 |
--- a/eclass/ELT-patches/portage/2.2 |
3277 |
+++ /dev/null |
3278 |
@@ -1,69 +0,0 @@ |
3279 |
---- ltmain.sh |
3280 |
-+++ ltmain.sh |
3281 |
-@@ -7410,9 +7410,53 @@ |
3282 |
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
3283 |
- test -z "$libdir" && \ |
3284 |
- func_fatal_error "\`$deplib' is not a valid libtool archive" |
3285 |
-- newdependency_libs="$newdependency_libs $libdir/$name" |
3286 |
-+ if test "x$EGREP" = x ; then |
3287 |
-+ EGREP=egrep |
3288 |
-+ fi |
3289 |
-+ # We do not want portage's install root ($D) present. Check only for |
3290 |
-+ # this if the .la is being installed. |
3291 |
-+ if test "$installed" = yes && test "$D"; then |
3292 |
-+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3293 |
-+ else |
3294 |
-+ mynewdependency_lib="$libdir/$name" |
3295 |
-+ fi |
3296 |
-+ # Do not add duplicates |
3297 |
-+ if test "$mynewdependency_lib"; then |
3298 |
-+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
3299 |
-+ if test -z "$my_little_ninja_foo_1"; then |
3300 |
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
3301 |
-+ fi |
3302 |
-+ fi |
3303 |
-+ ;; |
3304 |
-+ *) |
3305 |
-+ if test "$installed" = yes; then |
3306 |
-+ # Rather use S=WORKDIR if our version of portage supports it. |
3307 |
-+ # This is because some ebuild (gcc) do not use $S as buildroot. |
3308 |
-+ if test "$WORKDIR"; then |
3309 |
-+ S="$WORKDIR" |
3310 |
-+ fi |
3311 |
-+ # We do not want portage's build root ($S) present. |
3312 |
-+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
3313 |
-+ # We do not want portage's install root ($D) present. |
3314 |
-+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
3315 |
-+ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
3316 |
-+ mynewdependency_lib="" |
3317 |
-+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
3318 |
-+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3319 |
-+ else |
3320 |
-+ mynewdependency_lib="$deplib" |
3321 |
-+ fi |
3322 |
-+ else |
3323 |
-+ mynewdependency_lib="$deplib" |
3324 |
-+ fi |
3325 |
-+ # Do not add duplicates |
3326 |
-+ if test "$mynewdependency_lib"; then |
3327 |
-+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
3328 |
-+ if test -z "$my_little_ninja_foo_4"; then |
3329 |
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
3330 |
-+ fi |
3331 |
-+ fi |
3332 |
- ;; |
3333 |
-- *) newdependency_libs="$newdependency_libs $deplib" ;; |
3334 |
- esac |
3335 |
- done |
3336 |
- dependency_libs="$newdependency_libs" |
3337 |
-@@ -7476,6 +7520,10 @@ |
3338 |
- case $host,$output,$installed,$module,$dlname in |
3339 |
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; |
3340 |
- esac |
3341 |
-+ # Do not add duplicates |
3342 |
-+ if test "$installed" = yes && test "$D"; then |
3343 |
-+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
3344 |
-+ fi |
3345 |
- $ECHO > $output "\ |
3346 |
- # $outputname - a libtool library file |
3347 |
- # Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION |
3348 |
diff --git a/eclass/ELT-patches/ppc64le/2.4.2 b/eclass/ELT-patches/ppc64le/2.4.2 |
3349 |
deleted file mode 100644 |
3350 |
index 8d3b116a3dec..000000000000 |
3351 |
--- a/eclass/ELT-patches/ppc64le/2.4.2 |
3352 |
+++ /dev/null |
3353 |
@@ -1,32 +0,0 @@ |
3354 |
-https://bugs.gentoo.org/580792 |
3355 |
-https://bugs.gentoo.org/581314 |
3356 |
-https://debbugs.gnu.org/23348 |
3357 |
- |
3358 |
-this adds support for ppc64le to older versions. most of this is upstream already. |
3359 |
- |
3360 |
---- a/m4/libtool.m4 |
3361 |
-+++ b/m4/libtool.m4 |
3362 |
-@@ -1329,6 +1329,9 @@ |
3363 |
- ppc64-*linux*|powerpc64-*linux*) |
3364 |
- LD="${LD-ld} -m elf32ppclinux" |
3365 |
- ;; |
3366 |
-+ ppc64le-*linux*|powerpc64le-*linux*) |
3367 |
-+ LD="${LD-ld} -m elf32lppclinux" |
3368 |
-+ ;; |
3369 |
- s390x-*linux*) |
3370 |
- LD="${LD-ld} -m elf_s390" |
3371 |
- ;; |
3372 |
-@@ -1345,9 +1348,12 @@ |
3373 |
- x86_64-*linux*) |
3374 |
- LD="${LD-ld} -m elf_x86_64" |
3375 |
- ;; |
3376 |
-- ppc*-*linux*|powerpc*-*linux*) |
3377 |
-+ powerpc-*linux*|powerpc64-*linux*) |
3378 |
- LD="${LD-ld} -m elf64ppc" |
3379 |
- ;; |
3380 |
-+ powerpcle-*linux*|powerpc64le-*linux*) |
3381 |
-+ LD="${LD-ld} -m elf64lppc" |
3382 |
-+ ;; |
3383 |
- s390*-*linux*|s390*-*tpf*) |
3384 |
- LD="${LD-ld} -m elf64_s390" |
3385 |
- ;; |
3386 |
diff --git a/eclass/ELT-patches/ppc64le/2.4.4 b/eclass/ELT-patches/ppc64le/2.4.4 |
3387 |
deleted file mode 100644 |
3388 |
index 0d86521653aa..000000000000 |
3389 |
--- a/eclass/ELT-patches/ppc64le/2.4.4 |
3390 |
+++ /dev/null |
3391 |
@@ -1,21 +0,0 @@ |
3392 |
-https://bugs.gentoo.org/580792 |
3393 |
-https://bugs.gentoo.org/581314 |
3394 |
-https://debbugs.gnu.org/23348 |
3395 |
- |
3396 |
-this fixes ppc64le handling in newer libtool versions |
3397 |
- |
3398 |
---- a/m4/libtool.m4 |
3399 |
-+++ b/m4/libtool.m4 |
3400 |
-@@ -1386,10 +1386,10 @@ |
3401 |
- x86_64-*linux*) |
3402 |
- LD="${LD-ld} -m elf_x86_64" |
3403 |
- ;; |
3404 |
-- powerpcle-*linux*) |
3405 |
-+ powerpcle-*linux*|powerpc64le-*linux*) |
3406 |
- LD="${LD-ld} -m elf64lppc" |
3407 |
- ;; |
3408 |
-- powerpc-*linux*) |
3409 |
-+ powerpc-*linux*|powerpc64-*linux*) |
3410 |
- LD="${LD-ld} -m elf64ppc" |
3411 |
- ;; |
3412 |
- s390*-*linux*|s390*-*tpf*) |
3413 |
diff --git a/eclass/ELT-patches/relink-prog/1.3d b/eclass/ELT-patches/relink-prog/1.3d |
3414 |
deleted file mode 100644 |
3415 |
index ccb6cb811c51..000000000000 |
3416 |
--- a/eclass/ELT-patches/relink-prog/1.3d |
3417 |
+++ /dev/null |
3418 |
@@ -1,24 +0,0 @@ |
3419 |
---- ltmain.sh |
3420 |
-+++ ltmain.sh |
3421 |
-@@ -3203,6 +3203,12 @@ |
3422 |
- add_dir="$add_dir -L$inst_prefix_dir$libdir" |
3423 |
- ;; |
3424 |
- esac |
3425 |
-+ else |
3426 |
-+ case $libdir in |
3427 |
-+ [\\/]*) |
3428 |
-+ add_dir="$add_dir -L\\\"\\\${D}\\\"$libdir" |
3429 |
-+ ;; |
3430 |
-+ esac |
3431 |
- fi |
3432 |
- add="-l$name" |
3433 |
- fi |
3434 |
-@@ -6630,7 +6636,7 @@ |
3435 |
- esac |
3436 |
- fi |
3437 |
- libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test |
3438 |
-- if test -n "$libdir" && test ! -f "$libfile"; then |
3439 |
-+ if test -n "$libdir" && test ! -f "${D}$libfile"; then |
3440 |
- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 |
3441 |
- finalize=no |
3442 |
- fi |
3443 |
diff --git a/eclass/ELT-patches/relink-prog/2.1b b/eclass/ELT-patches/relink-prog/2.1b |
3444 |
deleted file mode 100644 |
3445 |
index 71a0970d5b49..000000000000 |
3446 |
--- a/eclass/ELT-patches/relink-prog/2.1b |
3447 |
+++ /dev/null |
3448 |
@@ -1,24 +0,0 @@ |
3449 |
---- ltmain-v2.2.6.in 2009-06-22 15:33:27.000000000 +0200 |
3450 |
-+++ ltmain-v2.2.6.in.new 2009-07-16 16:21:04.000000000 +0200 |
3451 |
-@@ -1742,7 +1742,7 @@ |
3452 |
- func_source "$lib" |
3453 |
- fi |
3454 |
- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test |
3455 |
-- if test -n "$libdir" && test ! -f "$libfile"; then |
3456 |
-+ if test -n "$libdir" && test ! -f "${D}$libfile"; then |
3457 |
- func_warning "\`$lib' has not been installed in \`$libdir'" |
3458 |
- finalize=no |
3459 |
- fi |
3460 |
-@@ -5351,6 +5351,12 @@ |
3461 |
- add_dir="$add_dir -L$inst_prefix_dir$libdir" |
3462 |
- ;; |
3463 |
- esac |
3464 |
-+ else |
3465 |
-+ case $libdir in |
3466 |
-+ [\\/]*) |
3467 |
-+ add_dir="$add_dir -L\\\"\\\${D}\\\"$libdir" |
3468 |
-+ ;; |
3469 |
-+ esac |
3470 |
- fi |
3471 |
- add="-l$name" |
3472 |
- fi |
3473 |
diff --git a/eclass/ELT-patches/relink/1.4.0a b/eclass/ELT-patches/relink/1.4.0a |
3474 |
deleted file mode 100644 |
3475 |
index 382d76087e62..000000000000 |
3476 |
--- a/eclass/ELT-patches/relink/1.4.0a |
3477 |
+++ /dev/null |
3478 |
@@ -1,99 +0,0 @@ |
3479 |
---- ltmain.sh Wed Oct 3 02:05:35 2001 |
3480 |
-+++ ltmain.sh Wed Oct 3 05:16:14 2001 |
3481 |
-@@ -754,6 +754,7 @@ |
3482 |
- linker_flags= |
3483 |
- dllsearchpath= |
3484 |
- lib_search_path=`pwd` |
3485 |
-+ inst_prefix_dir= |
3486 |
- |
3487 |
- avoid_version=no |
3488 |
- dlfiles= |
3489 |
-@@ -884,6 +885,11 @@ |
3490 |
- prev= |
3491 |
- continue |
3492 |
- ;; |
3493 |
-+ inst_prefix) |
3494 |
-+ inst_prefix_dir="$arg" |
3495 |
-+ prev= |
3496 |
-+ continue |
3497 |
-+ ;; |
3498 |
- release) |
3499 |
- release="-$arg" |
3500 |
- prev= |
3501 |
-@@ -985,6 +991,11 @@ |
3502 |
- continue |
3503 |
- ;; |
3504 |
- |
3505 |
-+ -inst-prefix-dir) |
3506 |
-+ prev=inst_prefix |
3507 |
-+ continue |
3508 |
-+ ;; |
3509 |
-+ |
3510 |
- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
3511 |
- # so, if we see these flags be careful not to treat them like -L |
3512 |
- -L[A-Z][A-Z]*:*) |
3513 |
-@@ -1866,6 +1877,7 @@ |
3514 |
- |
3515 |
- if test "$linkmode" = prog || test "$mode" = relink; then |
3516 |
- add_shlibpath= |
3517 |
-+ add_prefix_dir= |
3518 |
- add_dir= |
3519 |
- add= |
3520 |
- # Finalize command for both is simple: just hardcode it. |
3521 |
-@@ -1886,10 +1898,22 @@ |
3522 |
- add="-l$name" |
3523 |
- fi |
3524 |
- |
3525 |
-+ if test -n "$inst_prefix_dir"; then |
3526 |
-+ case "$libdir" in |
3527 |
-+ [\\/]*) |
3528 |
-+ add_prefix_dir="-L$inst_prefix_dir$libdir" |
3529 |
-+ ;; |
3530 |
-+ esac |
3531 |
-+ fi |
3532 |
-+ |
3533 |
-+ # add_prefix_dir must be appended instead, otherwise it can |
3534 |
-+ # possibly be overrided by any hardcoded -L/... path in deplibs |
3535 |
- if test "$linkmode" = prog; then |
3536 |
-+ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" |
3537 |
- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
3538 |
- test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
3539 |
- else |
3540 |
-+ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" |
3541 |
- test -n "$add_dir" && deplibs="$add_dir $deplibs" |
3542 |
- test -n "$add" && deplibs="$add $deplibs" |
3543 |
- fi |
3544 |
-@@ -3856,7 +3880,7 @@ |
3545 |
- fi |
3546 |
- done |
3547 |
- # Quote the link command for shipping. |
3548 |
-- relink_command="($relink_command; cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" |
3549 |
-+ relink_command="($relink_command; cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" |
3550 |
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
3551 |
- |
3552 |
- # Only create the output if not a dry run. |
3553 |
-@@ -4157,6 +4181,24 @@ |
3554 |
- dir="$dir$objdir" |
3555 |
- |
3556 |
- if test -n "$relink_command"; then |
3557 |
-+ # Determine the prefix the user has applied to our future dir. |
3558 |
-+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
3559 |
-+ |
3560 |
-+ # Don't allow the user to place us outside of our expected |
3561 |
-+ # location b/c this prevents finding dependent libraries that |
3562 |
-+ # are installed to the same prefix. |
3563 |
-+ if test "$inst_prefix_dir" = "$destdir"; then |
3564 |
-+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
3565 |
-+ exit 1 |
3566 |
-+ fi |
3567 |
-+ |
3568 |
-+ if test -n "$inst_prefix_dir"; then |
3569 |
-+ # Stick the inst_prefix_dir data into the link command. |
3570 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
3571 |
-+ else |
3572 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
3573 |
-+ fi |
3574 |
-+ |
3575 |
- $echo "$modename: warning: relinking \`$file'" 1>&2 |
3576 |
- $show "$relink_command" |
3577 |
- if $run eval "$relink_command"; then : |
3578 |
diff --git a/eclass/ELT-patches/relink/1.4.0a-GCC3.0-1 b/eclass/ELT-patches/relink/1.4.0a-GCC3.0-1 |
3579 |
deleted file mode 100644 |
3580 |
index 6bf45e58c57d..000000000000 |
3581 |
--- a/eclass/ELT-patches/relink/1.4.0a-GCC3.0-1 |
3582 |
+++ /dev/null |
3583 |
@@ -1,99 +0,0 @@ |
3584 |
---- ltmain.sh Wed Oct 3 02:05:35 2001 |
3585 |
-+++ ltmain.sh Wed Oct 3 05:16:14 2001 |
3586 |
-@@ -754,6 +754,7 @@ |
3587 |
- linker_flags= |
3588 |
- dllsearchpath= |
3589 |
- lib_search_path=`pwd` |
3590 |
-+ inst_prefix_dir= |
3591 |
- |
3592 |
- avoid_version=no |
3593 |
- dlfiles= |
3594 |
-@@ -884,6 +885,11 @@ |
3595 |
- prev= |
3596 |
- continue |
3597 |
- ;; |
3598 |
-+ inst_prefix) |
3599 |
-+ inst_prefix_dir="$arg" |
3600 |
-+ prev= |
3601 |
-+ continue |
3602 |
-+ ;; |
3603 |
- release) |
3604 |
- release="-$arg" |
3605 |
- prev= |
3606 |
-@@ -985,6 +991,11 @@ |
3607 |
- continue |
3608 |
- ;; |
3609 |
- |
3610 |
-+ -inst-prefix-dir) |
3611 |
-+ prev=inst_prefix |
3612 |
-+ continue |
3613 |
-+ ;; |
3614 |
-+ |
3615 |
- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
3616 |
- # so, if we see these flags be careful not to treat them like -L |
3617 |
- -L[A-Z][A-Z]*:*) |
3618 |
-@@ -1866,6 +1877,7 @@ |
3619 |
- |
3620 |
- if test "$linkmode" = prog || test "$mode" = relink; then |
3621 |
- add_shlibpath= |
3622 |
-+ add_prefix_dir= |
3623 |
- add_dir= |
3624 |
- add= |
3625 |
- # Finalize command for both is simple: just hardcode it. |
3626 |
-@@ -1886,10 +1898,22 @@ |
3627 |
- add="-l$name" |
3628 |
- fi |
3629 |
- |
3630 |
-+ if test -n "$inst_prefix_dir"; then |
3631 |
-+ case "$libdir" in |
3632 |
-+ [\\/]*) |
3633 |
-+ add_prefix_dir="-L$inst_prefix_dir$libdir" |
3634 |
-+ ;; |
3635 |
-+ esac |
3636 |
-+ fi |
3637 |
-+ |
3638 |
-+ # add_prefix_dir must be appended instead, otherwise it can |
3639 |
-+ # possibly be overrided by any hardcoded -L/... path in deplibs |
3640 |
- if test "$linkmode" = prog; then |
3641 |
-+ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" |
3642 |
- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
3643 |
- test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
3644 |
- else |
3645 |
-+ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" |
3646 |
- test -n "$add_dir" && deplibs="$add_dir $deplibs" |
3647 |
- test -n "$add" && deplibs="$add $deplibs" |
3648 |
- fi |
3649 |
-@@ -3856,7 +3880,7 @@ |
3650 |
- for tag in $taglist; do |
3651 |
- tagopts="$tagopts --tag $tag" |
3652 |
- done |
3653 |
-- relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args)" |
3654 |
-+ relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args @inst_prefix_dir@)" |
3655 |
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
3656 |
- |
3657 |
- # Only create the output if not a dry run. |
3658 |
-@@ -4157,6 +4181,24 @@ |
3659 |
- dir="$dir$objdir" |
3660 |
- |
3661 |
- if test -n "$relink_command"; then |
3662 |
-+ # Determine the prefix the user has applied to our future dir. |
3663 |
-+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
3664 |
-+ |
3665 |
-+ # Don't allow the user to place us outside of our expected |
3666 |
-+ # location b/c this prevents finding dependent libraries that |
3667 |
-+ # are installed to the same prefix. |
3668 |
-+ if test "$inst_prefix_dir" = "$destdir"; then |
3669 |
-+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
3670 |
-+ exit 1 |
3671 |
-+ fi |
3672 |
-+ |
3673 |
-+ if test -n "$inst_prefix_dir"; then |
3674 |
-+ # Stick the inst_prefix_dir data into the link command. |
3675 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
3676 |
-+ else |
3677 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
3678 |
-+ fi |
3679 |
-+ |
3680 |
- $echo "$modename: warning: relinking \`$file'" 1>&2 |
3681 |
- $show "$relink_command" |
3682 |
- if $run eval "$relink_command"; then : |
3683 |
diff --git a/eclass/ELT-patches/relink/1.4.0a-GCC3.0-2 b/eclass/ELT-patches/relink/1.4.0a-GCC3.0-2 |
3684 |
deleted file mode 100644 |
3685 |
index 55103a42e204..000000000000 |
3686 |
--- a/eclass/ELT-patches/relink/1.4.0a-GCC3.0-2 |
3687 |
+++ /dev/null |
3688 |
@@ -1,100 +0,0 @@ |
3689 |
---- ltmain.sh Wed Oct 3 02:05:35 2001 |
3690 |
-+++ ltmain.sh Wed Oct 3 05:16:14 2001 |
3691 |
-@@ -754,6 +754,7 @@ |
3692 |
- linker_flags= |
3693 |
- dllsearchpath= |
3694 |
- lib_search_path=`pwd` |
3695 |
-+ inst_prefix_dir= |
3696 |
- |
3697 |
- avoid_version=no |
3698 |
- dlfiles= |
3699 |
-@@ -884,6 +885,11 @@ |
3700 |
- prev= |
3701 |
- continue |
3702 |
- ;; |
3703 |
-+ inst_prefix) |
3704 |
-+ inst_prefix_dir="$arg" |
3705 |
-+ prev= |
3706 |
-+ continue |
3707 |
-+ ;; |
3708 |
- release) |
3709 |
- release="-$arg" |
3710 |
- prev= |
3711 |
-@@ -985,6 +991,11 @@ |
3712 |
- continue |
3713 |
- ;; |
3714 |
- |
3715 |
-+ -inst-prefix-dir) |
3716 |
-+ prev=inst_prefix |
3717 |
-+ continue |
3718 |
-+ ;; |
3719 |
-+ |
3720 |
- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
3721 |
- # so, if we see these flags be careful not to treat them like -L |
3722 |
- -L[A-Z][A-Z]*:*) |
3723 |
-@@ -1866,6 +1877,7 @@ |
3724 |
- |
3725 |
- if test "$linkmode" = prog || test "$mode" = relink; then |
3726 |
- add_shlibpath= |
3727 |
-+ add_prefix_dir= |
3728 |
- add_dir= |
3729 |
- add= |
3730 |
- # Finalize command for both is simple: just hardcode it. |
3731 |
-@@ -1886,10 +1898,22 @@ |
3732 |
- add="-l$name" |
3733 |
- fi |
3734 |
- |
3735 |
-- if test $linkmode = prog; then |
3736 |
-+ if test -n "$inst_prefix_dir"; then |
3737 |
-+ case "$libdir" in |
3738 |
-+ [\\/]*) |
3739 |
-+ add_prefix_dir="-L$inst_prefix_dir$libdir" |
3740 |
-+ ;; |
3741 |
-+ esac |
3742 |
-+ fi |
3743 |
-+ |
3744 |
-+ # add_prefix_dir must be appended instead, otherwise it can |
3745 |
-+ # possibly be overrided by any hardcoded -L/... path in deplibs |
3746 |
-+ if test "$linkmode" = prog; then |
3747 |
-+ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" |
3748 |
- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
3749 |
- test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
3750 |
- else |
3751 |
-+ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" |
3752 |
- test -n "$add_dir" && deplibs="$add_dir $deplibs" |
3753 |
- test -n "$add" && deplibs="$add $deplibs" |
3754 |
- fi |
3755 |
-@@ -3856,7 +3880,7 @@ |
3756 |
- for tag in $taglist; do |
3757 |
- tagopts="$tagopts --tag $tag" |
3758 |
- done |
3759 |
-- relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args)" |
3760 |
-+ relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args @inst_prefix_dir@)" |
3761 |
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
3762 |
- |
3763 |
- # Only create the output if not a dry run. |
3764 |
-@@ -4157,6 +4181,24 @@ |
3765 |
- dir="$dir$objdir" |
3766 |
- |
3767 |
- if test -n "$relink_command"; then |
3768 |
-+ # Determine the prefix the user has applied to our future dir. |
3769 |
-+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
3770 |
-+ |
3771 |
-+ # Don't allow the user to place us outside of our expected |
3772 |
-+ # location b/c this prevents finding dependent libraries that |
3773 |
-+ # are installed to the same prefix. |
3774 |
-+ if test "$inst_prefix_dir" = "$destdir"; then |
3775 |
-+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
3776 |
-+ exit 1 |
3777 |
-+ fi |
3778 |
-+ |
3779 |
-+ if test -n "$inst_prefix_dir"; then |
3780 |
-+ # Stick the inst_prefix_dir data into the link command. |
3781 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
3782 |
-+ else |
3783 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
3784 |
-+ fi |
3785 |
-+ |
3786 |
- $echo "$modename: warning: relinking \`$file'" 1>&2 |
3787 |
- $show "$relink_command" |
3788 |
- if $run eval "$relink_command"; then : |
3789 |
diff --git a/eclass/ELT-patches/relink/1.4.1 b/eclass/ELT-patches/relink/1.4.1 |
3790 |
deleted file mode 100644 |
3791 |
index f34863f685e9..000000000000 |
3792 |
--- a/eclass/ELT-patches/relink/1.4.1 |
3793 |
+++ /dev/null |
3794 |
@@ -1,124 +0,0 @@ |
3795 |
---- ltmain.sh Sun Aug 12 18:08:05 2001 |
3796 |
-+++ ltmain.sh Tue Aug 28 18:55:13 2001 |
3797 |
-@@ -827,6 +827,7 @@ |
3798 |
- linker_flags= |
3799 |
- dllsearchpath= |
3800 |
- lib_search_path=`pwd` |
3801 |
-+ inst_prefix_dir= |
3802 |
- |
3803 |
- avoid_version=no |
3804 |
- dlfiles= |
3805 |
-@@ -959,6 +960,11 @@ |
3806 |
- prev= |
3807 |
- continue |
3808 |
- ;; |
3809 |
-+ inst_prefix) |
3810 |
-+ inst_prefix_dir="$arg" |
3811 |
-+ prev= |
3812 |
-+ continue |
3813 |
-+ ;; |
3814 |
- release) |
3815 |
- release="-$arg" |
3816 |
- prev= |
3817 |
-@@ -1167,6 +1173,11 @@ |
3818 |
- continue |
3819 |
- ;; |
3820 |
- |
3821 |
-+ -inst-prefix-dir) |
3822 |
-+ prev=inst_prefix |
3823 |
-+ continue |
3824 |
-+ ;; |
3825 |
-+ |
3826 |
- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
3827 |
- # so, if we see these flags be careful not to treat them like -L |
3828 |
- -L[A-Z][A-Z]*:*) |
3829 |
-@@ -2231,7 +2242,16 @@ |
3830 |
- if test "$hardcode_direct" = yes; then |
3831 |
- add="$libdir/$linklib" |
3832 |
- elif test "$hardcode_minus_L" = yes; then |
3833 |
-- add_dir="-L$libdir" |
3834 |
-+ # Try looking first in the location we're being installed to. |
3835 |
-+ add_dir= |
3836 |
-+ if test -n "$inst_prefix_dir"; then |
3837 |
-+ case "$libdir" in |
3838 |
-+ [\\/]*) |
3839 |
-+ add_dir="-L$inst_prefix_dir$libdir" |
3840 |
-+ ;; |
3841 |
-+ esac |
3842 |
-+ fi |
3843 |
-+ add_dir="$add_dir -L$libdir" |
3844 |
- add="-l$name" |
3845 |
- elif test "$hardcode_shlibpath_var" = yes; then |
3846 |
- case :$finalize_shlibpath: in |
3847 |
-@@ -2241,7 +2261,16 @@ |
3848 |
- add="-l$name" |
3849 |
- else |
3850 |
- # We cannot seem to hardcode it, guess we'll fake it. |
3851 |
-- add_dir="-L$libdir" |
3852 |
-+ # Try looking first in the location we're being installed to. |
3853 |
-+ add_dir= |
3854 |
-+ if test -n "$inst_prefix_dir"; then |
3855 |
-+ case "$libdir" in |
3856 |
-+ [\\/]*) |
3857 |
-+ add_dir="-L$inst_prefix_dir$libdir" |
3858 |
-+ ;; |
3859 |
-+ esac |
3860 |
-+ fi |
3861 |
-+ add_dir="$add_dir -L$libdir" |
3862 |
- add="-l$name" |
3863 |
- fi |
3864 |
- |
3865 |
-@@ -4321,7 +4350,7 @@ |
3866 |
- fi |
3867 |
- done |
3868 |
- # Quote the link command for shipping. |
3869 |
-- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" |
3870 |
-+ relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@" |
3871 |
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
3872 |
- |
3873 |
- # Only create the output if not a dry run. |
3874 |
-@@ -4622,12 +4651,30 @@ |
3875 |
- dir="$dir$objdir" |
3876 |
- |
3877 |
- if test -n "$relink_command"; then |
3878 |
-+ # Determine the prefix the user has applied to our future dir. |
3879 |
-+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
3880 |
-+ |
3881 |
-+ # Don't allow the user to place us outside of our expected |
3882 |
-+ # location b/c this prevents finding dependent libraries that |
3883 |
-+ # are installed to the same prefix. |
3884 |
-+ if test "$inst_prefix_dir" = "$destdir"; then |
3885 |
-+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
3886 |
-+ exit 1 |
3887 |
-+ fi |
3888 |
-+ |
3889 |
-+ if test -n "$inst_prefix_dir"; then |
3890 |
-+ # Stick the inst_prefix_dir data into the link command. |
3891 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
3892 |
-+ else |
3893 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
3894 |
-+ fi |
3895 |
-+ |
3896 |
- $echo "$modename: warning: relinking \`$file'" 1>&2 |
3897 |
- $show "$relink_command" |
3898 |
- if $run eval "$relink_command"; then : |
3899 |
- else |
3900 |
- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 |
3901 |
-- continue |
3902 |
-+ exit 1 |
3903 |
- fi |
3904 |
- fi |
3905 |
- |
3906 |
-@@ -4782,7 +4829,11 @@ |
3907 |
- if test "$finalize" = yes && test -z "$run"; then |
3908 |
- tmpdir="/tmp" |
3909 |
- test -n "$TMPDIR" && tmpdir="$TMPDIR" |
3910 |
-- tmpdir="$tmpdir/libtool-$$" |
3911 |
-+ tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` |
3912 |
-+ if test $? = 0 ; then : |
3913 |
-+ else |
3914 |
-+ tmpdir="$tmpdir/libtool-$$" |
3915 |
-+ fi |
3916 |
- if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : |
3917 |
- else |
3918 |
- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 |
3919 |
diff --git a/eclass/ELT-patches/relink/1.4.2 b/eclass/ELT-patches/relink/1.4.2 |
3920 |
deleted file mode 100644 |
3921 |
index 17a630b7cfe8..000000000000 |
3922 |
--- a/eclass/ELT-patches/relink/1.4.2 |
3923 |
+++ /dev/null |
3924 |
@@ -1,99 +0,0 @@ |
3925 |
---- ltmain.sh Wed Oct 3 02:05:35 2001 |
3926 |
-+++ ltmain.sh Wed Oct 3 05:16:14 2001 |
3927 |
-@@ -754,6 +754,7 @@ |
3928 |
- linker_flags= |
3929 |
- dllsearchpath= |
3930 |
- lib_search_path=`pwd` |
3931 |
-+ inst_prefix_dir= |
3932 |
- |
3933 |
- avoid_version=no |
3934 |
- dlfiles= |
3935 |
-@@ -884,6 +885,11 @@ |
3936 |
- prev= |
3937 |
- continue |
3938 |
- ;; |
3939 |
-+ inst_prefix) |
3940 |
-+ inst_prefix_dir="$arg" |
3941 |
-+ prev= |
3942 |
-+ continue |
3943 |
-+ ;; |
3944 |
- release) |
3945 |
- release="-$arg" |
3946 |
- prev= |
3947 |
-@@ -985,6 +991,11 @@ |
3948 |
- continue |
3949 |
- ;; |
3950 |
- |
3951 |
-+ -inst-prefix-dir) |
3952 |
-+ prev=inst_prefix |
3953 |
-+ continue |
3954 |
-+ ;; |
3955 |
-+ |
3956 |
- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
3957 |
- # so, if we see these flags be careful not to treat them like -L |
3958 |
- -L[A-Z][A-Z]*:*) |
3959 |
-@@ -1866,6 +1877,7 @@ |
3960 |
- |
3961 |
- if test "$linkmode" = prog || test "$mode" = relink; then |
3962 |
- add_shlibpath= |
3963 |
-+ add_prefix_dir= |
3964 |
- add_dir= |
3965 |
- add= |
3966 |
- # Finalize command for both is simple: just hardcode it. |
3967 |
-@@ -1886,10 +1898,22 @@ |
3968 |
- add="-l$name" |
3969 |
- fi |
3970 |
- |
3971 |
-+ if test -n "$inst_prefix_dir"; then |
3972 |
-+ case "$libdir" in |
3973 |
-+ [\\/]*) |
3974 |
-+ add_prefix_dir="-L$inst_prefix_dir$libdir" |
3975 |
-+ ;; |
3976 |
-+ esac |
3977 |
-+ fi |
3978 |
-+ |
3979 |
-+ # add_prefix_dir must be appended instead, otherwise it can |
3980 |
-+ # possibly be overrided by any hardcoded -L/... path in deplibs |
3981 |
- if test "$linkmode" = prog; then |
3982 |
-+ test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" |
3983 |
- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
3984 |
- test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
3985 |
- else |
3986 |
-+ test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" |
3987 |
- test -n "$add_dir" && deplibs="$add_dir $deplibs" |
3988 |
- test -n "$add" && deplibs="$add $deplibs" |
3989 |
- fi |
3990 |
-@@ -3856,7 +3880,7 @@ |
3991 |
- fi |
3992 |
- done |
3993 |
- # Quote the link command for shipping. |
3994 |
-- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" |
3995 |
-+ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" |
3996 |
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
3997 |
- |
3998 |
- # Only create the output if not a dry run. |
3999 |
-@@ -4157,6 +4181,24 @@ |
4000 |
- dir="$dir$objdir" |
4001 |
- |
4002 |
- if test -n "$relink_command"; then |
4003 |
-+ # Determine the prefix the user has applied to our future dir. |
4004 |
-+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
4005 |
-+ |
4006 |
-+ # Don't allow the user to place us outside of our expected |
4007 |
-+ # location b/c this prevents finding dependent libraries that |
4008 |
-+ # are installed to the same prefix. |
4009 |
-+ if test "$inst_prefix_dir" = "$destdir"; then |
4010 |
-+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
4011 |
-+ exit 1 |
4012 |
-+ fi |
4013 |
-+ |
4014 |
-+ if test -n "$inst_prefix_dir"; then |
4015 |
-+ # Stick the inst_prefix_dir data into the link command. |
4016 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
4017 |
-+ else |
4018 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
4019 |
-+ fi |
4020 |
-+ |
4021 |
- $echo "$modename: warning: relinking \`$file'" 1>&2 |
4022 |
- $show "$relink_command" |
4023 |
- if $run eval "$relink_command"; then : |
4024 |
diff --git a/eclass/ELT-patches/relink/1.4.3 b/eclass/ELT-patches/relink/1.4.3 |
4025 |
deleted file mode 100644 |
4026 |
index 3ed5fe3784a6..000000000000 |
4027 |
--- a/eclass/ELT-patches/relink/1.4.3 |
4028 |
+++ /dev/null |
4029 |
@@ -1,111 +0,0 @@ |
4030 |
---- ltmain.sh Mon Feb 4 15:12:15 2002 |
4031 |
-+++ ltmain.sh Mon Feb 4 15:12:15 2002 |
4032 |
-@@ -745,6 +745,7 @@ |
4033 |
- linker_flags= |
4034 |
- dllsearchpath= |
4035 |
- lib_search_path=`pwd` |
4036 |
-+ inst_prefix_dir= |
4037 |
- |
4038 |
- avoid_version=no |
4039 |
- dlfiles= |
4040 |
-@@ -875,6 +876,11 @@ |
4041 |
- prev= |
4042 |
- continue |
4043 |
- ;; |
4044 |
-+ inst_prefix) |
4045 |
-+ inst_prefix_dir="$arg" |
4046 |
-+ prev= |
4047 |
-+ continue |
4048 |
-+ ;; |
4049 |
- release) |
4050 |
- release="-$arg" |
4051 |
- prev= |
4052 |
-@@ -976,6 +982,11 @@ |
4053 |
- continue |
4054 |
- ;; |
4055 |
- |
4056 |
-+ -inst-prefix-dir) |
4057 |
-+ prev=inst_prefix |
4058 |
-+ continue |
4059 |
-+ ;; |
4060 |
-+ |
4061 |
- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* |
4062 |
- # so, if we see these flags be careful not to treat them like -L |
4063 |
- -L[A-Z][A-Z]*:*) |
4064 |
-@@ -1851,7 +1862,16 @@ |
4065 |
- if test "$hardcode_direct" = yes; then |
4066 |
- add="$libdir/$linklib" |
4067 |
- elif test "$hardcode_minus_L" = yes; then |
4068 |
-- add_dir="-L$libdir" |
4069 |
-+ # Try looking first in the location we're being installed to. |
4070 |
-+ add_dir= |
4071 |
-+ if test -n "$inst_prefix_dir"; then |
4072 |
-+ case "$libdir" in |
4073 |
-+ [\\/]*) |
4074 |
-+ add_dir="-L$inst_prefix_dir$libdir" |
4075 |
-+ ;; |
4076 |
-+ esac |
4077 |
-+ fi |
4078 |
-+ add_dir="$add_dir -L$libdir" |
4079 |
- add="-l$name" |
4080 |
- elif test "$hardcode_shlibpath_var" = yes; then |
4081 |
- case :$finalize_shlibpath: in |
4082 |
-@@ -1861,7 +1881,16 @@ |
4083 |
- add="-l$name" |
4084 |
- else |
4085 |
- # We cannot seem to hardcode it, guess we'll fake it. |
4086 |
-- add_dir="-L$libdir" |
4087 |
-+ # Try looking first in the location we're being installed to. |
4088 |
-+ add_dir= |
4089 |
-+ if test -n "$inst_prefix_dir"; then |
4090 |
-+ case "$libdir" in |
4091 |
-+ [\\/]*) |
4092 |
-+ add_dir="-L$inst_prefix_dir$libdir" |
4093 |
-+ ;; |
4094 |
-+ esac |
4095 |
-+ fi |
4096 |
-+ add_dir="$add_dir -L$libdir" |
4097 |
- add="-l$name" |
4098 |
- fi |
4099 |
- |
4100 |
-@@ -3823,7 +3852,7 @@ |
4101 |
- fi |
4102 |
- done |
4103 |
- # Quote the link command for shipping. |
4104 |
-- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" |
4105 |
-+ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" |
4106 |
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
4107 |
- |
4108 |
- # Only create the output if not a dry run. |
4109 |
-@@ -4124,12 +4153,30 @@ |
4110 |
- dir="$dir$objdir" |
4111 |
- |
4112 |
- if test -n "$relink_command"; then |
4113 |
-+ # Determine the prefix the user has applied to our future dir. |
4114 |
-+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` |
4115 |
-+ |
4116 |
-+ # Don't allow the user to place us outside of our expected |
4117 |
-+ # location b/c this prevents finding dependent libraries that |
4118 |
-+ # are installed to the same prefix. |
4119 |
-+ if test "$inst_prefix_dir" = "$destdir"; then |
4120 |
-+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 |
4121 |
-+ exit 1 |
4122 |
-+ fi |
4123 |
-+ |
4124 |
-+ if test -n "$inst_prefix_dir"; then |
4125 |
-+ # Stick the inst_prefix_dir data into the link command. |
4126 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` |
4127 |
-+ else |
4128 |
-+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` |
4129 |
-+ fi |
4130 |
-+ |
4131 |
- $echo "$modename: warning: relinking \`$file'" 1>&2 |
4132 |
- $show "$relink_command" |
4133 |
- if $run eval "$relink_command"; then : |
4134 |
- else |
4135 |
- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 |
4136 |
-- continue |
4137 |
-+ exit 1 |
4138 |
- fi |
4139 |
- fi |
4140 |
- |
4141 |
diff --git a/eclass/ELT-patches/rem-int-dep/1.3.5 b/eclass/ELT-patches/rem-int-dep/1.3.5 |
4142 |
deleted file mode 100644 |
4143 |
index 4302623607b6..000000000000 |
4144 |
--- a/eclass/ELT-patches/rem-int-dep/1.3.5 |
4145 |
+++ /dev/null |
4146 |
@@ -1,11 +0,0 @@ |
4147 |
---- ltmain.sh 2002-11-01 19:56:50.000000000 -0600 |
4148 |
-+++ ltmain.sh 2002-11-01 19:57:03.000000000 -0600 |
4149 |
-@@ -4551,6 +4551,8 @@ |
4150 |
- if test "$installed" = yes && test "$D"; then |
4151 |
- install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`" |
4152 |
- fi |
4153 |
-+ # Removing @REM_INT_DEP@ from dependency_libs in .la |
4154 |
-+ dependency_libs=`echo $dependency_libs | $Xsed -e 's%\([^ ]*lib@REM_INT_DEP@\.\(so\|la\|a\)\)\|\(-l@REM_INT_DEP@\)%%g'` |
4155 |
- \$echo > \$output "\\ |
4156 |
- # \$outputname - a libtool library file |
4157 |
- # Generated by \$PROGRAM - GNU \$PACKAGE \$VERSION\$TIMESTAMP |
4158 |
diff --git a/eclass/ELT-patches/sed/1.3.4 b/eclass/ELT-patches/sed/1.3.4 |
4159 |
deleted file mode 100644 |
4160 |
index c88ff727a7e1..000000000000 |
4161 |
--- a/eclass/ELT-patches/sed/1.3.4 |
4162 |
+++ /dev/null |
4163 |
@@ -1,14 +0,0 @@ |
4164 |
---- ltmain.sh 2005-05-13 11:48:24.000000000 +0200 |
4165 |
-+++ ltmain.sh 2005-05-13 11:48:42.000000000 +0200 |
4166 |
-@@ -47,6 +47,11 @@ |
4167 |
- exit 0 |
4168 |
- fi |
4169 |
- |
4170 |
-+# define variables for historic ltconfig's generated by Libtool 1.3 |
4171 |
-+test -z "$SED" && SED=sed |
4172 |
-+test -z "$EGREP" && EGREP=egrep |
4173 |
-+test -z "$LTCC" && LTCC=${CC-gcc} |
4174 |
-+ |
4175 |
- # The name of this program. |
4176 |
- progname=`$echo "$0" | sed 's%^.*/%%'` |
4177 |
- modename="$progname" |
4178 |
diff --git a/eclass/ELT-patches/sed/1.4.0 b/eclass/ELT-patches/sed/1.4.0 |
4179 |
deleted file mode 100644 |
4180 |
index 9c51ac2de0ff..000000000000 |
4181 |
--- a/eclass/ELT-patches/sed/1.4.0 |
4182 |
+++ /dev/null |
4183 |
@@ -1,14 +0,0 @@ |
4184 |
---- ltmain.sh 2003-02-13 14:54:24.000000000 +0100 |
4185 |
-+++ ltmain.sh 2003-02-13 15:24:49.000000000 +0100 |
4186 |
-@@ -48,6 +48,11 @@ EOF |
4187 |
- exit 0 |
4188 |
- fi |
4189 |
- |
4190 |
-+# define variables for historic ltconfig's generated by Libtool 1.3 |
4191 |
-+test -z "$SED" && SED=sed |
4192 |
-+test -z "$EGREP" && EGREP=egrep |
4193 |
-+test -z "$LTCC" && LTCC=${CC-gcc} |
4194 |
-+ |
4195 |
- # The name of this program. |
4196 |
- progname=`$echo "$0" | ${SED} 's%^.*/%%'` |
4197 |
- modename="$progname" |
4198 |
diff --git a/eclass/ELT-patches/sed/1.5.6 b/eclass/ELT-patches/sed/1.5.6 |
4199 |
deleted file mode 100644 |
4200 |
index 5efd5310dcff..000000000000 |
4201 |
--- a/eclass/ELT-patches/sed/1.5.6 |
4202 |
+++ /dev/null |
4203 |
@@ -1,16 +0,0 @@ |
4204 |
---- ltmain.sh 2005-04-16 16:50:02.000000000 +0200 |
4205 |
-+++ ltmain.sh 2005-04-16 16:46:46.000000000 +0200 |
4206 |
-@@ -39,6 +39,13 @@ |
4207 |
- if [ "x$SED" = x ] ; then |
4208 |
- SED=sed |
4209 |
- fi |
4210 |
-+# Same for EGREP, and just to be sure, do LTCC as well |
4211 |
-+if test "x$EGREP" = x ; then |
4212 |
-+ EGREP=egrep |
4213 |
-+fi |
4214 |
-+if test "x$LTCC" = x ; then |
4215 |
-+ LTCC=${CC-gcc} |
4216 |
-+fi |
4217 |
- |
4218 |
- # The name of this program: |
4219 |
- progname=`echo "$progpath" | $SED $basename` |
4220 |
diff --git a/eclass/ELT-patches/sol2-conf/2.4.2 b/eclass/ELT-patches/sol2-conf/2.4.2 |
4221 |
deleted file mode 100644 |
4222 |
index a57f22c9ca3a..000000000000 |
4223 |
--- a/eclass/ELT-patches/sol2-conf/2.4.2 |
4224 |
+++ /dev/null |
4225 |
@@ -1,14 +0,0 @@ |
4226 |
-Unbreak x86_64-pc-solaris2.1[01], it IS 64-bits too. Without this, |
4227 |
-libtool thinks the linker is called ld_sol2. |
4228 |
- |
4229 |
---- configure |
4230 |
-+++ configure |
4231 |
-@@ -1383,7 +1383,7 @@ |
4232 |
- case $lt_cv_prog_gnu_ld in |
4233 |
- yes*) |
4234 |
- case $host in |
4235 |
-- i?86-*-solaris*) |
4236 |
-+ i?86-*-solaris*|x86_64-*-solaris*) |
4237 |
- LD="${LD-ld} -m elf_x86_64" |
4238 |
- ;; |
4239 |
- sparc*-*-solaris*) |
4240 |
diff --git a/eclass/ELT-patches/sol2-ltmain/2.4.2 b/eclass/ELT-patches/sol2-ltmain/2.4.2 |
4241 |
deleted file mode 100644 |
4242 |
index ad35ed88db45..000000000000 |
4243 |
--- a/eclass/ELT-patches/sol2-ltmain/2.4.2 |
4244 |
+++ /dev/null |
4245 |
@@ -1,11 +0,0 @@ |
4246 |
---- libltdl/config/ltmain.sh |
4247 |
-+++ libltdl/config/ltmain.sh |
4248 |
-@@ -1180,7 +1180,7 @@ |
4249 |
- test "$opt_debug" = : || func_append preserve_args " --debug" |
4250 |
- |
4251 |
- case $host in |
4252 |
-- *cygwin* | *mingw* | *pw32* | *cegcc*) |
4253 |
-+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2*) |
4254 |
- # don't eliminate duplications in $postdeps and $predeps |
4255 |
- opt_duplicate_compiler_generated_deps=: |
4256 |
- ;; |
4257 |
diff --git a/eclass/ELT-patches/sys-lib-dlsearch/2.4 b/eclass/ELT-patches/sys-lib-dlsearch/2.4 |
4258 |
deleted file mode 100644 |
4259 |
index 89eb6992e391..000000000000 |
4260 |
--- a/eclass/ELT-patches/sys-lib-dlsearch/2.4 |
4261 |
+++ /dev/null |
4262 |
@@ -1,21 +0,0 @@ |
4263 |
-the linux target parses /etc/ld.so.conf to see what paths are |
4264 |
-searched at runtime, and hardcodes /lib /usr/lib as a fallback. |
4265 |
-this works poorly when cross-compiling, so tweak the behavior: |
4266 |
- - search $SYSROOT/etc/ld.so.conf |
4267 |
- - default to Gentoo's notion of the active multilib |
4268 |
- |
4269 |
---- a/configure |
4270 |
-+++ b/configure |
4271 |
-@@ -10405,9 +10405,9 @@ |
4272 |
- hardcode_into_libs=yes |
4273 |
- |
4274 |
- # Append ld.so.conf contents to the search path |
4275 |
-- if test -f /etc/ld.so.conf; then |
4276 |
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
4277 |
-- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
4278 |
-+ if test -f "$SYSROOT"/etc/ld.so.conf; then |
4279 |
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < "$SYSROOT"/etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
4280 |
-+ sys_lib_dlsearch_path_spec="/@GENTOO_LIBDIR@ /usr/@GENTOO_LIBDIR@ $lt_ld_extra" |
4281 |
- fi |
4282 |
- |
4283 |
- # We used to test for /lib/ld.so.1 and disable shared libraries on |
4284 |
diff --git a/eclass/ELT-patches/target-nm/2.4.2 b/eclass/ELT-patches/target-nm/2.4.2 |
4285 |
deleted file mode 100644 |
4286 |
index 1f22220b6fd9..000000000000 |
4287 |
--- a/eclass/ELT-patches/target-nm/2.4.2 |
4288 |
+++ /dev/null |
4289 |
@@ -1,45 +0,0 @@ |
4290 |
-https://bugs.gentoo.org/465558 |
4291 |
- |
4292 |
-From a4629ebff263dcb2e05feb9e41df649ea5ce3f78 Mon Sep 17 00:00:00 2001 |
4293 |
-From: Peter Rosin <peda@×××××××××××.se> |
4294 |
-Date: Sun, 28 Apr 2013 09:16:56 +0200 |
4295 |
-Subject: [PATCH] libtool: break all the way out when a good nm is found |
4296 |
- |
4297 |
-The current code tries to locate a compatible nm tool. It starts with |
4298 |
-a prefixed nm tool (great!) and includes a plain nm too (that's fine). |
4299 |
-The problem is that the code searches for the prefixed nm before the |
4300 |
-plain nm (normally fine), but doesn't break once it has found a valid |
4301 |
-match, and the plain nm ends up the winner. |
4302 |
- |
4303 |
-Report and analysis by Mike Frysinger. |
4304 |
- |
4305 |
-* m4/libtool.m4 (LT_PATH_NM): Break all the way out on a good match. |
4306 |
- |
4307 |
-Signed-off-by: Peter Rosin <peda@×××××××××××.se> |
4308 |
---- |
4309 |
- m4/libtool.m4 | 4 ++-- |
4310 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
4311 |
- |
4312 |
-diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
4313 |
-index 3f50b0c..d7013c5 100644 |
4314 |
---- a/m4/libtool.m4 |
4315 |
-+++ b/m4/libtool.m4 |
4316 |
-@@ -3397,13 +3397,13 @@ else |
4317 |
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
4318 |
- */dev/null* | *'Invalid file or object type'*) |
4319 |
- lt_cv_path_NM="$tmp_nm -B" |
4320 |
-- break |
4321 |
-+ break 2 |
4322 |
- ;; |
4323 |
- *) |
4324 |
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
4325 |
- */dev/null*) |
4326 |
- lt_cv_path_NM="$tmp_nm -p" |
4327 |
-- break |
4328 |
-+ break 2 |
4329 |
- ;; |
4330 |
- *) |
4331 |
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
4332 |
--- |
4333 |
-1.8.2.1 |
4334 |
- |
4335 |
diff --git a/eclass/ELT-patches/test/1.4.0 b/eclass/ELT-patches/test/1.4.0 |
4336 |
deleted file mode 100644 |
4337 |
index d6f442f0e38d..000000000000 |
4338 |
--- a/eclass/ELT-patches/test/1.4.0 |
4339 |
+++ /dev/null |
4340 |
@@ -1,291 +0,0 @@ |
4341 |
---- ltmain.sh Tue May 29 19:16:03 2001 |
4342 |
-+++ ltmain.sh Tue May 29 21:26:50 2001 |
4343 |
-@@ -459,7 +459,7 @@ |
4344 |
- pic_mode=default |
4345 |
- ;; |
4346 |
- esac |
4347 |
-- if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then |
4348 |
-+ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then |
4349 |
- # non-PIC code in shared libraries is not supported |
4350 |
- pic_mode=default |
4351 |
- fi |
4352 |
-@@ -1343,7 +1343,7 @@ |
4353 |
- ;; |
4354 |
- esac |
4355 |
- for pass in $passes; do |
4356 |
-- if test $linkmode = prog; then |
4357 |
-+ if test "$linkmode" = prog; then |
4358 |
- # Determine which files to process |
4359 |
- case $pass in |
4360 |
- dlopen) |
4361 |
-@@ -1360,11 +1360,11 @@ |
4362 |
- found=no |
4363 |
- case $deplib in |
4364 |
- -l*) |
4365 |
-- if test $linkmode = oldlib && test $linkmode = obj; then |
4366 |
-+ if test "$linkmode" = oldlib && test "$linkmode" = obj; then |
4367 |
- $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 |
4368 |
- continue |
4369 |
- fi |
4370 |
-- if test $pass = conv; then |
4371 |
-+ if test "$pass" = conv; then |
4372 |
- deplibs="$deplib $deplibs" |
4373 |
- continue |
4374 |
- fi |
4375 |
-@@ -1384,7 +1384,7 @@ |
4376 |
- finalize_deplibs="$deplib $finalize_deplibs" |
4377 |
- else |
4378 |
- deplibs="$deplib $deplibs" |
4379 |
-- test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" |
4380 |
-+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" |
4381 |
- fi |
4382 |
- continue |
4383 |
- fi |
4384 |
-@@ -1393,16 +1393,16 @@ |
4385 |
- case $linkmode in |
4386 |
- lib) |
4387 |
- deplibs="$deplib $deplibs" |
4388 |
-- test $pass = conv && continue |
4389 |
-+ test "$pass" = conv && continue |
4390 |
- newdependency_libs="$deplib $newdependency_libs" |
4391 |
- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` |
4392 |
- ;; |
4393 |
- prog) |
4394 |
-- if test $pass = conv; then |
4395 |
-+ if test "$pass" = conv; then |
4396 |
- deplibs="$deplib $deplibs" |
4397 |
- continue |
4398 |
- fi |
4399 |
-- if test $pass = scan; then |
4400 |
-+ if test "$pass" = scan; then |
4401 |
- deplibs="$deplib $deplibs" |
4402 |
- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` |
4403 |
- else |
4404 |
-@@ -1417,7 +1417,7 @@ |
4405 |
- continue |
4406 |
- ;; # -L |
4407 |
- -R*) |
4408 |
-- if test $pass = link; then |
4409 |
-+ if test "$pass" = link; then |
4410 |
- dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` |
4411 |
- # Make sure the xrpath contains only unique directories. |
4412 |
- case "$xrpath " in |
4413 |
-@@ -1430,7 +1430,7 @@ |
4414 |
- ;; |
4415 |
- *.la) lib="$deplib" ;; |
4416 |
- *.$libext) |
4417 |
-- if test $pass = conv; then |
4418 |
-+ if test "$pass" = conv; then |
4419 |
- deplibs="$deplib $deplibs" |
4420 |
- continue |
4421 |
- fi |
4422 |
-@@ -1451,7 +1451,7 @@ |
4423 |
- continue |
4424 |
- ;; |
4425 |
- prog) |
4426 |
-- if test $pass != link; then |
4427 |
-+ if test "$pass" != link; then |
4428 |
- deplibs="$deplib $deplibs" |
4429 |
- else |
4430 |
- compile_deplibs="$deplib $compile_deplibs" |
4431 |
-@@ -1462,7 +1462,7 @@ |
4432 |
- esac # linkmode |
4433 |
- ;; # *.$libext |
4434 |
- *.lo | *.$objext) |
4435 |
-- if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
4436 |
-+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
4437 |
- # If there is no dlopen support or we're linking statically, |
4438 |
- # we need to preload. |
4439 |
- newdlprefiles="$newdlprefiles $deplib" |
4440 |
-@@ -1512,13 +1512,13 @@ |
4441 |
- |
4442 |
- if test "$linkmode,$pass" = "lib,link" || |
4443 |
- test "$linkmode,$pass" = "prog,scan" || |
4444 |
-- { test $linkmode = oldlib && test $linkmode = obj; }; then |
4445 |
-+ { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then |
4446 |
- # Add dl[pre]opened files of deplib |
4447 |
- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" |
4448 |
- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" |
4449 |
- fi |
4450 |
- |
4451 |
-- if test $pass = conv; then |
4452 |
-+ if test "$pass" = conv; then |
4453 |
- # Only check for convenience libraries |
4454 |
- deplibs="$lib $deplibs" |
4455 |
- if test -z "$libdir"; then |
4456 |
-@@ -1537,7 +1537,7 @@ |
4457 |
- esac |
4458 |
- tmp_libs="$tmp_libs $deplib" |
4459 |
- done |
4460 |
-- elif test $linkmode != prog && test $linkmode != lib; then |
4461 |
-+ elif test "$linkmode" != prog && test "$linkmode" != lib; then |
4462 |
- $echo "$modename: \`$lib' is not a convenience library" 1>&2 |
4463 |
- exit 1 |
4464 |
- fi |
4465 |
-@@ -1555,7 +1555,7 @@ |
4466 |
- fi |
4467 |
- |
4468 |
- # This library was specified with -dlopen. |
4469 |
-- if test $pass = dlopen; then |
4470 |
-+ if test "$pass" = dlopen; then |
4471 |
- if test -z "$libdir"; then |
4472 |
- $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 |
4473 |
- exit 1 |
4474 |
-@@ -1604,7 +1604,7 @@ |
4475 |
- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` |
4476 |
- |
4477 |
- # This library was specified with -dlpreopen. |
4478 |
-- if test $pass = dlpreopen; then |
4479 |
-+ if test "$pass" = dlpreopen; then |
4480 |
- if test -z "$libdir"; then |
4481 |
- $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 |
4482 |
- exit 1 |
4483 |
-@@ -1623,7 +1623,7 @@ |
4484 |
- |
4485 |
- if test -z "$libdir"; then |
4486 |
- # Link the convenience library |
4487 |
-- if test $linkmode = lib; then |
4488 |
-+ if test "$linkmode" = lib; then |
4489 |
- deplibs="$dir/$old_library $deplibs" |
4490 |
- elif test "$linkmode,$pass" = "prog,link"; then |
4491 |
- compile_deplibs="$dir/$old_library $compile_deplibs" |
4492 |
-@@ -1634,7 +1634,7 @@ |
4493 |
- continue |
4494 |
- fi |
4495 |
- |
4496 |
-- if test $linkmode = prog && test $pass != link; then |
4497 |
-+ if test "$linkmode" = prog && test "$pass" != link; then |
4498 |
- newlib_search_path="$newlib_search_path $ladir" |
4499 |
- deplibs="$lib $deplibs" |
4500 |
- |
4501 |
-@@ -1671,7 +1671,7 @@ |
4502 |
- # Link against this shared library |
4503 |
- |
4504 |
- if test "$linkmode,$pass" = "prog,link" || |
4505 |
-- { test $linkmode = lib && test $hardcode_into_libs = yes; }; then |
4506 |
-+ { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then |
4507 |
- # Hardcode the library path. |
4508 |
- # Skip directories that are in the system default run-time |
4509 |
- # search path. |
4510 |
-@@ -1693,7 +1693,7 @@ |
4511 |
- esac |
4512 |
- ;; |
4513 |
- esac |
4514 |
-- if test $linkmode = prog; then |
4515 |
-+ if test "$linkmode" = prog; then |
4516 |
- # We need to hardcode the library path |
4517 |
- if test -n "$shlibpath_var"; then |
4518 |
- # Make sure the rpath contains only unique directories. |
4519 |
-@@ -1777,7 +1777,7 @@ |
4520 |
- linklib=$newlib |
4521 |
- fi # test -n $old_archive_from_expsyms_cmds |
4522 |
- |
4523 |
-- if test $linkmode = prog || test "$mode" != relink; then |
4524 |
-+ if test "$linkmode" = prog || test "$mode" != relink; then |
4525 |
- add_shlibpath= |
4526 |
- add_dir= |
4527 |
- add= |
4528 |
-@@ -1826,7 +1826,7 @@ |
4529 |
- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; |
4530 |
- esac |
4531 |
- fi |
4532 |
-- if test $linkmode = prog; then |
4533 |
-+ if test "$linkmode" = prog; then |
4534 |
- test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" |
4535 |
- test -n "$add" && compile_deplibs="$add $compile_deplibs" |
4536 |
- else |
4537 |
-@@ -1843,7 +1843,7 @@ |
4538 |
- fi |
4539 |
- fi |
4540 |
- |
4541 |
-- if test $linkmode = prog || test "$mode" = relink; then |
4542 |
-+ if test "$linkmode" = prog || test "$mode" = relink; then |
4543 |
- add_shlibpath= |
4544 |
- add_dir= |
4545 |
- add= |
4546 |
-@@ -1865,7 +1865,7 @@ |
4547 |
- add="-l$name" |
4548 |
- fi |
4549 |
- |
4550 |
-- if test $linkmode = prog; then |
4551 |
-+ if test "$linkmode" = prog; then |
4552 |
- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
4553 |
- test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
4554 |
- else |
4555 |
-@@ -1873,7 +1873,7 @@ |
4556 |
- test -n "$add" && deplibs="$add $deplibs" |
4557 |
- fi |
4558 |
- fi |
4559 |
-- elif test $linkmode = prog; then |
4560 |
-+ elif test "$linkmode" = prog; then |
4561 |
- if test "$alldeplibs" = yes && |
4562 |
- { test "$deplibs_check_method" = pass_all || |
4563 |
- { test "$build_libtool_libs" = yes && |
4564 |
-@@ -1932,9 +1932,9 @@ |
4565 |
- fi |
4566 |
- fi # link shared/static library? |
4567 |
- |
4568 |
-- if test $linkmode = lib; then |
4569 |
-+ if test "$linkmode" = lib; then |
4570 |
- if test -n "$dependency_libs" && |
4571 |
-- { test $hardcode_into_libs != yes || test $build_old_libs = yes || |
4572 |
-+ { test "$hardcode_into_libs" != yes || test $build_old_libs = yes || |
4573 |
- test $link_static = yes; }; then |
4574 |
- # Extract -R from dependency_libs |
4575 |
- temp_deplibs= |
4576 |
-@@ -1964,7 +1964,7 @@ |
4577 |
- tmp_libs="$tmp_libs $deplib" |
4578 |
- done |
4579 |
- |
4580 |
-- if test $link_all_deplibs != no; then |
4581 |
-+ if test "$link_all_deplibs" != no; then |
4582 |
- # Add the search paths of all dependency libraries |
4583 |
- for deplib in $dependency_libs; do |
4584 |
- case $deplib in |
4585 |
-@@ -2007,15 +2007,15 @@ |
4586 |
- fi # link_all_deplibs != no |
4587 |
- fi # linkmode = lib |
4588 |
- done # for deplib in $libs |
4589 |
-- if test $pass = dlpreopen; then |
4590 |
-+ if test "$pass" = dlpreopen; then |
4591 |
- # Link the dlpreopened libraries before other libraries |
4592 |
- for deplib in $save_deplibs; do |
4593 |
- deplibs="$deplib $deplibs" |
4594 |
- done |
4595 |
- fi |
4596 |
-- if test $pass != dlopen; then |
4597 |
-- test $pass != scan && dependency_libs="$newdependency_libs" |
4598 |
-- if test $pass != conv; then |
4599 |
-+ if test "$pass" != dlopen; then |
4600 |
-+ test "$pass" != scan && dependency_libs="$newdependency_libs" |
4601 |
-+ if test "$pass" != conv; then |
4602 |
- # Make sure lib_search_path contains only unique directories. |
4603 |
- lib_search_path= |
4604 |
- for dir in $newlib_search_path; do |
4605 |
-@@ -2073,7 +2073,7 @@ |
4606 |
- deplibs= |
4607 |
- fi |
4608 |
- done # for pass |
4609 |
-- if test $linkmode = prog; then |
4610 |
-+ if test "$linkmode" = prog; then |
4611 |
- dlfiles="$newdlfiles" |
4612 |
- dlprefiles="$newdlprefiles" |
4613 |
- fi |
4614 |
-@@ -2410,7 +2410,7 @@ |
4615 |
- ;; |
4616 |
- *) |
4617 |
- # Add libc to deplibs on all other systems if necessary. |
4618 |
-- if test $build_libtool_need_lc = "yes"; then |
4619 |
-+ if test "$build_libtool_need_lc" = "yes"; then |
4620 |
- deplibs="$deplibs -lc" |
4621 |
- fi |
4622 |
- ;; |
4623 |
-@@ -2683,7 +2683,7 @@ |
4624 |
- |
4625 |
- # Test again, we may have decided not to build it any more |
4626 |
- if test "$build_libtool_libs" = yes; then |
4627 |
-- if test $hardcode_into_libs = yes; then |
4628 |
-+ if test "$hardcode_into_libs" = yes; then |
4629 |
- # Hardcode the library paths |
4630 |
- hardcode_libdirs= |
4631 |
- dep_rpath= |
4632 |
diff --git a/eclass/ELT-patches/test/1.4.2 b/eclass/ELT-patches/test/1.4.2 |
4633 |
deleted file mode 100644 |
4634 |
index 8ae65ef00280..000000000000 |
4635 |
--- a/eclass/ELT-patches/test/1.4.2 |
4636 |
+++ /dev/null |
4637 |
@@ -1,578 +0,0 @@ |
4638 |
---- ltmain.sh 2001-09-10 19:40:18.000000000 -0400 |
4639 |
-+++ ltmain.sh 2002-07-11 14:49:35.000000000 -0400 |
4640 |
-@@ -467,7 +467,7 @@ if test -z "$show_help"; then |
4641 |
- pic_mode=default |
4642 |
- ;; |
4643 |
- esac |
4644 |
-- if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then |
4645 |
-+ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then |
4646 |
- # non-PIC code in shared libraries is not supported |
4647 |
- pic_mode=default |
4648 |
- fi |
4649 |
-@@ -1303,11 +1303,11 @@ compiler." |
4650 |
- output_objdir="$output_objdir/$objdir" |
4651 |
- fi |
4652 |
- # Create the object directory. |
4653 |
-- if test ! -d $output_objdir; then |
4654 |
-+ if test ! -d "$output_objdir"; then |
4655 |
- $show "$mkdir $output_objdir" |
4656 |
- $run $mkdir $output_objdir |
4657 |
- status=$? |
4658 |
-- if test $status -ne 0 && test ! -d $output_objdir; then |
4659 |
-+ if test "$status" -ne 0 && test ! -d "$output_objdir"; then |
4660 |
- exit $status |
4661 |
- fi |
4662 |
- fi |
4663 |
-@@ -1366,7 +1366,7 @@ compiler." |
4664 |
- ;; |
4665 |
- esac |
4666 |
- for pass in $passes; do |
4667 |
-- if test $linkmode = prog; then |
4668 |
-+ if test "$linkmode" = prog; then |
4669 |
- # Determine which files to process |
4670 |
- case $pass in |
4671 |
- dlopen) |
4672 |
-@@ -1383,11 +1383,11 @@ compiler." |
4673 |
- found=no |
4674 |
- case $deplib in |
4675 |
- -l*) |
4676 |
-- if test $linkmode = oldlib && test $linkmode = obj; then |
4677 |
-+ if test "$linkmode" = oldlib && test "$linkmode" = obj; then |
4678 |
- $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 |
4679 |
- continue |
4680 |
- fi |
4681 |
-- if test $pass = conv; then |
4682 |
-+ if test "$pass" = conv; then |
4683 |
- deplibs="$deplib $deplibs" |
4684 |
- continue |
4685 |
- fi |
4686 |
-@@ -1407,7 +1407,7 @@ compiler." |
4687 |
- finalize_deplibs="$deplib $finalize_deplibs" |
4688 |
- else |
4689 |
- deplibs="$deplib $deplibs" |
4690 |
-- test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" |
4691 |
-+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" |
4692 |
- fi |
4693 |
- continue |
4694 |
- fi |
4695 |
-@@ -1416,16 +1416,16 @@ compiler." |
4696 |
- case $linkmode in |
4697 |
- lib) |
4698 |
- deplibs="$deplib $deplibs" |
4699 |
-- test $pass = conv && continue |
4700 |
-+ test "$pass" = conv && continue |
4701 |
- newdependency_libs="$deplib $newdependency_libs" |
4702 |
- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` |
4703 |
- ;; |
4704 |
- prog) |
4705 |
-- if test $pass = conv; then |
4706 |
-+ if test "$pass" = conv; then |
4707 |
- deplibs="$deplib $deplibs" |
4708 |
- continue |
4709 |
- fi |
4710 |
-- if test $pass = scan; then |
4711 |
-+ if test "$pass" = scan; then |
4712 |
- deplibs="$deplib $deplibs" |
4713 |
- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` |
4714 |
- else |
4715 |
-@@ -1440,7 +1440,7 @@ compiler." |
4716 |
- continue |
4717 |
- ;; # -L |
4718 |
- -R*) |
4719 |
-- if test $pass = link; then |
4720 |
-+ if test "$pass" = link; then |
4721 |
- dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` |
4722 |
- # Make sure the xrpath contains only unique directories. |
4723 |
- case "$xrpath " in |
4724 |
-@@ -1453,7 +1453,7 @@ compiler." |
4725 |
- ;; |
4726 |
- *.la) lib="$deplib" ;; |
4727 |
- *.$libext) |
4728 |
-- if test $pass = conv; then |
4729 |
-+ if test "$pass" = conv; then |
4730 |
- deplibs="$deplib $deplibs" |
4731 |
- continue |
4732 |
- fi |
4733 |
-@@ -1474,7 +1474,7 @@ compiler." |
4734 |
- continue |
4735 |
- ;; |
4736 |
- prog) |
4737 |
-- if test $pass != link; then |
4738 |
-+ if test "$pass" != link; then |
4739 |
- deplibs="$deplib $deplibs" |
4740 |
- else |
4741 |
- compile_deplibs="$deplib $compile_deplibs" |
4742 |
-@@ -1485,7 +1485,7 @@ compiler." |
4743 |
- esac # linkmode |
4744 |
- ;; # *.$libext |
4745 |
- *.lo | *.$objext) |
4746 |
-- if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
4747 |
-+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
4748 |
- # If there is no dlopen support or we're linking statically, |
4749 |
- # we need to preload. |
4750 |
- newdlprefiles="$newdlprefiles $deplib" |
4751 |
-@@ -1501,7 +1501,7 @@ compiler." |
4752 |
- continue |
4753 |
- ;; |
4754 |
- esac # case $deplib |
4755 |
-- if test $found = yes || test -f "$lib"; then : |
4756 |
-+ if test "$found" = yes || test -f "$lib"; then : |
4757 |
- else |
4758 |
- $echo "$modename: cannot find the library \`$lib'" 1>&2 |
4759 |
- exit 1 |
4760 |
-@@ -1535,13 +1535,13 @@ compiler." |
4761 |
- |
4762 |
- if test "$linkmode,$pass" = "lib,link" || |
4763 |
- test "$linkmode,$pass" = "prog,scan" || |
4764 |
-- { test $linkmode = oldlib && test $linkmode = obj; }; then |
4765 |
-+ { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then |
4766 |
- # Add dl[pre]opened files of deplib |
4767 |
- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" |
4768 |
- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" |
4769 |
- fi |
4770 |
- |
4771 |
-- if test $pass = conv; then |
4772 |
-+ if test "$pass" = conv; then |
4773 |
- # Only check for convenience libraries |
4774 |
- deplibs="$lib $deplibs" |
4775 |
- if test -z "$libdir"; then |
4776 |
-@@ -1560,7 +1560,7 @@ compiler." |
4777 |
- esac |
4778 |
- tmp_libs="$tmp_libs $deplib" |
4779 |
- done |
4780 |
-- elif test $linkmode != prog && test $linkmode != lib; then |
4781 |
-+ elif test "$linkmode" != prog && test "$linkmode" != lib; then |
4782 |
- $echo "$modename: \`$lib' is not a convenience library" 1>&2 |
4783 |
- exit 1 |
4784 |
- fi |
4785 |
-@@ -1578,7 +1578,7 @@ compiler." |
4786 |
- fi |
4787 |
- |
4788 |
- # This library was specified with -dlopen. |
4789 |
-- if test $pass = dlopen; then |
4790 |
-+ if test "$pass" = dlopen; then |
4791 |
- if test -z "$libdir"; then |
4792 |
- $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 |
4793 |
- exit 1 |
4794 |
-@@ -1627,7 +1627,7 @@ compiler." |
4795 |
- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` |
4796 |
- |
4797 |
- # This library was specified with -dlpreopen. |
4798 |
-- if test $pass = dlpreopen; then |
4799 |
-+ if test "$pass" = dlpreopen; then |
4800 |
- if test -z "$libdir"; then |
4801 |
- $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 |
4802 |
- exit 1 |
4803 |
-@@ -1646,7 +1646,7 @@ compiler." |
4804 |
- |
4805 |
- if test -z "$libdir"; then |
4806 |
- # Link the convenience library |
4807 |
-- if test $linkmode = lib; then |
4808 |
-+ if test "$linkmode" = lib; then |
4809 |
- deplibs="$dir/$old_library $deplibs" |
4810 |
- elif test "$linkmode,$pass" = "prog,link"; then |
4811 |
- compile_deplibs="$dir/$old_library $compile_deplibs" |
4812 |
-@@ -1657,7 +1657,7 @@ compiler." |
4813 |
- continue |
4814 |
- fi |
4815 |
- |
4816 |
-- if test $linkmode = prog && test $pass != link; then |
4817 |
-+ if test "$linkmode" = prog && test "$pass" != link; then |
4818 |
- newlib_search_path="$newlib_search_path $ladir" |
4819 |
- deplibs="$lib $deplibs" |
4820 |
- |
4821 |
-@@ -1673,7 +1673,7 @@ compiler." |
4822 |
- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test |
4823 |
- esac |
4824 |
- # Need to link against all dependency_libs? |
4825 |
-- if test $linkalldeplibs = yes; then |
4826 |
-+ if test "$linkalldeplibs" = yes; then |
4827 |
- deplibs="$deplib $deplibs" |
4828 |
- else |
4829 |
- # Need to hardcode shared library paths |
4830 |
-@@ -1694,7 +1694,7 @@ compiler." |
4831 |
- # Link against this shared library |
4832 |
- |
4833 |
- if test "$linkmode,$pass" = "prog,link" || |
4834 |
-- { test $linkmode = lib && test $hardcode_into_libs = yes; }; then |
4835 |
-+ { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then |
4836 |
- # Hardcode the library path. |
4837 |
- # Skip directories that are in the system default run-time |
4838 |
- # search path. |
4839 |
-@@ -1716,7 +1716,7 @@ compiler." |
4840 |
- esac |
4841 |
- ;; |
4842 |
- esac |
4843 |
-- if test $linkmode = prog; then |
4844 |
-+ if test "$linkmode" = prog; then |
4845 |
- # We need to hardcode the library path |
4846 |
- if test -n "$shlibpath_var"; then |
4847 |
- # Make sure the rpath contains only unique directories. |
4848 |
-@@ -1798,9 +1798,9 @@ compiler." |
4849 |
- # make sure the library variables are pointing to the new library |
4850 |
- dir=$output_objdir |
4851 |
- linklib=$newlib |
4852 |
-- fi # test -n $old_archive_from_expsyms_cmds |
4853 |
-+ fi # test -n "$old_archive_from_expsyms_cmds" |
4854 |
- |
4855 |
-- if test $linkmode = prog || test "$mode" != relink; then |
4856 |
-+ if test "$linkmode" = prog || test "$mode" != relink; then |
4857 |
- add_shlibpath= |
4858 |
- add_dir= |
4859 |
- add= |
4860 |
-@@ -1849,7 +1849,7 @@ compiler." |
4861 |
- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; |
4862 |
- esac |
4863 |
- fi |
4864 |
-- if test $linkmode = prog; then |
4865 |
-+ if test "$linkmode" = prog; then |
4866 |
- test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" |
4867 |
- test -n "$add" && compile_deplibs="$add $compile_deplibs" |
4868 |
- else |
4869 |
-@@ -1866,7 +1866,7 @@ compiler." |
4870 |
- fi |
4871 |
- fi |
4872 |
- |
4873 |
-- if test $linkmode = prog || test "$mode" = relink; then |
4874 |
-+ if test "$linkmode" = prog || test "$mode" = relink; then |
4875 |
- add_shlibpath= |
4876 |
- add_dir= |
4877 |
- add= |
4878 |
-@@ -1888,7 +1888,7 @@ compiler." |
4879 |
- add="-l$name" |
4880 |
- fi |
4881 |
- |
4882 |
-- if test $linkmode = prog; then |
4883 |
-+ if test "$linkmode" = prog; then |
4884 |
- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
4885 |
- test -n "$add" && finalize_deplibs="$add $finalize_deplibs" |
4886 |
- else |
4887 |
-@@ -1896,7 +1896,7 @@ compiler." |
4888 |
- test -n "$add" && deplibs="$add $deplibs" |
4889 |
- fi |
4890 |
- fi |
4891 |
-- elif test $linkmode = prog; then |
4892 |
-+ elif test "$linkmode" = prog; then |
4893 |
- if test "$alldeplibs" = yes && |
4894 |
- { test "$deplibs_check_method" = pass_all || |
4895 |
- { test "$build_libtool_libs" = yes && |
4896 |
-@@ -1955,10 +1955,10 @@ compiler." |
4897 |
- fi |
4898 |
- fi # link shared/static library? |
4899 |
- |
4900 |
-- if test $linkmode = lib; then |
4901 |
-+ if test "$linkmode" = lib; then |
4902 |
- if test -n "$dependency_libs" && |
4903 |
-- { test $hardcode_into_libs != yes || test $build_old_libs = yes || |
4904 |
-- test $link_static = yes; }; then |
4905 |
-+ { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || |
4906 |
-+ test "$link_static" = yes; }; then |
4907 |
- # Extract -R from dependency_libs |
4908 |
- temp_deplibs= |
4909 |
- for libdir in $dependency_libs; do |
4910 |
-@@ -1987,7 +1987,7 @@ compiler." |
4911 |
- tmp_libs="$tmp_libs $deplib" |
4912 |
- done |
4913 |
- |
4914 |
-- if test $link_all_deplibs != no; then |
4915 |
-+ if test "$link_all_deplibs" != no; then |
4916 |
- # Add the search paths of all dependency libraries |
4917 |
- for deplib in $dependency_libs; do |
4918 |
- case $deplib in |
4919 |
-@@ -2030,15 +2030,15 @@ compiler." |
4920 |
- fi # link_all_deplibs != no |
4921 |
- fi # linkmode = lib |
4922 |
- done # for deplib in $libs |
4923 |
-- if test $pass = dlpreopen; then |
4924 |
-+ if test "$pass" = dlpreopen; then |
4925 |
- # Link the dlpreopened libraries before other libraries |
4926 |
- for deplib in $save_deplibs; do |
4927 |
- deplibs="$deplib $deplibs" |
4928 |
- done |
4929 |
- fi |
4930 |
-- if test $pass != dlopen; then |
4931 |
-- test $pass != scan && dependency_libs="$newdependency_libs" |
4932 |
-- if test $pass != conv; then |
4933 |
-+ if test "$pass" != dlopen; then |
4934 |
-+ test "$pass" != scan && dependency_libs="$newdependency_libs" |
4935 |
-+ if test "$pass" != conv; then |
4936 |
- # Make sure lib_search_path contains only unique directories. |
4937 |
- lib_search_path= |
4938 |
- for dir in $newlib_search_path; do |
4939 |
-@@ -2096,7 +2096,7 @@ compiler." |
4940 |
- deplibs= |
4941 |
- fi |
4942 |
- done # for pass |
4943 |
-- if test $linkmode = prog; then |
4944 |
-+ if test "$linkmode" = prog; then |
4945 |
- dlfiles="$newdlfiles" |
4946 |
- dlprefiles="$newdlprefiles" |
4947 |
- fi |
4948 |
-@@ -2173,7 +2173,7 @@ compiler." |
4949 |
- fi |
4950 |
- |
4951 |
- set dummy $rpath |
4952 |
-- if test $# -gt 2; then |
4953 |
-+ if test "$#" -gt 2; then |
4954 |
- $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 |
4955 |
- fi |
4956 |
- install_libdir="$2" |
4957 |
-@@ -2240,7 +2240,7 @@ compiler." |
4958 |
- ;; |
4959 |
- esac |
4960 |
- |
4961 |
-- if test $age -gt $current; then |
4962 |
-+ if test "$age" -gt "$current"; then |
4963 |
- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 |
4964 |
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 |
4965 |
- exit 1 |
4966 |
-@@ -2279,7 +2279,7 @@ compiler." |
4967 |
- |
4968 |
- # Add in all the interfaces that we are compatible with. |
4969 |
- loop=$revision |
4970 |
-- while test $loop != 0; do |
4971 |
-+ while test "$loop" -ne 0; do |
4972 |
- iface=`expr $revision - $loop` |
4973 |
- loop=`expr $loop - 1` |
4974 |
- verstring="sgi$major.$iface:$verstring" |
4975 |
-@@ -2302,7 +2302,7 @@ compiler." |
4976 |
- |
4977 |
- # Add in all the interfaces that we are compatible with. |
4978 |
- loop=$age |
4979 |
-- while test $loop != 0; do |
4980 |
-+ while test "$loop" -ne 0; do |
4981 |
- iface=`expr $current - $loop` |
4982 |
- loop=`expr $loop - 1` |
4983 |
- verstring="$verstring:${iface}.0" |
4984 |
-@@ -2403,7 +2403,7 @@ compiler." |
4985 |
- *) finalize_rpath="$finalize_rpath $libdir" ;; |
4986 |
- esac |
4987 |
- done |
4988 |
-- if test $hardcode_into_libs != yes || test $build_old_libs = yes; then |
4989 |
-+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then |
4990 |
- dependency_libs="$temp_xrpath $dependency_libs" |
4991 |
- fi |
4992 |
- fi |
4993 |
-@@ -2446,7 +2446,7 @@ compiler." |
4994 |
- ;; |
4995 |
- *) |
4996 |
- # Add libc to deplibs on all other systems if necessary. |
4997 |
-- if test $build_libtool_need_lc = "yes"; then |
4998 |
-+ if test "$build_libtool_need_lc" = "yes"; then |
4999 |
- deplibs="$deplibs -lc" |
5000 |
- fi |
5001 |
- ;; |
5002 |
-@@ -2487,7 +2487,7 @@ compiler." |
5003 |
- EOF |
5004 |
- $rm conftest |
5005 |
- $CC -o conftest conftest.c $deplibs |
5006 |
-- if test $? -eq 0 ; then |
5007 |
-+ if test "$?" -eq 0 ; then |
5008 |
- ldd_output=`ldd conftest` |
5009 |
- for i in $deplibs; do |
5010 |
- name="`expr $i : '-l\(.*\)'`" |
5011 |
-@@ -2521,7 +2521,7 @@ EOF |
5012 |
- $rm conftest |
5013 |
- $CC -o conftest conftest.c $i |
5014 |
- # Did it work? |
5015 |
-- if test $? -eq 0 ; then |
5016 |
-+ if test "$?" -eq 0 ; then |
5017 |
- ldd_output=`ldd conftest` |
5018 |
- libname=`eval \\$echo \"$libname_spec\"` |
5019 |
- deplib_matches=`eval \\$echo \"$library_names_spec\"` |
5020 |
-@@ -2692,7 +2692,7 @@ EOF |
5021 |
- echo "*** automatically added whenever a program is linked with this library" |
5022 |
- echo "*** or is declared to -dlopen it." |
5023 |
- |
5024 |
-- if test $allow_undefined = no; then |
5025 |
-+ if test "$allow_undefined" = no; then |
5026 |
- echo |
5027 |
- echo "*** Since this library must not contain undefined symbols," |
5028 |
- echo "*** because either the platform does not support them or" |
5029 |
-@@ -2719,7 +2719,7 @@ EOF |
5030 |
- |
5031 |
- # Test again, we may have decided not to build it any more |
5032 |
- if test "$build_libtool_libs" = yes; then |
5033 |
-- if test $hardcode_into_libs = yes; then |
5034 |
-+ if test "$hardcode_into_libs" = yes; then |
5035 |
- # Hardcode the library paths |
5036 |
- hardcode_libdirs= |
5037 |
- dep_rpath= |
5038 |
-@@ -2850,7 +2850,7 @@ EOF |
5039 |
- $show "mkdir $gentop" |
5040 |
- $run mkdir "$gentop" |
5041 |
- status=$? |
5042 |
-- if test $status -ne 0 && test ! -d "$gentop"; then |
5043 |
-+ if test "$status" -ne 0 && test ! -d "$gentop"; then |
5044 |
- exit $status |
5045 |
- fi |
5046 |
- generated="$generated $gentop" |
5047 |
-@@ -2869,7 +2869,7 @@ EOF |
5048 |
- $show "mkdir $xdir" |
5049 |
- $run mkdir "$xdir" |
5050 |
- status=$? |
5051 |
-- if test $status -ne 0 && test ! -d "$xdir"; then |
5052 |
-+ if test "$status" -ne 0 && test ! -d "$xdir"; then |
5053 |
- exit $status |
5054 |
- fi |
5055 |
- $show "(cd $xdir && $AR x $xabs)" |
5056 |
-@@ -2989,7 +2989,7 @@ EOF |
5057 |
- $show "mkdir $gentop" |
5058 |
- $run mkdir "$gentop" |
5059 |
- status=$? |
5060 |
-- if test $status -ne 0 && test ! -d "$gentop"; then |
5061 |
-+ if test "$status" -ne 0 && test ! -d "$gentop"; then |
5062 |
- exit $status |
5063 |
- fi |
5064 |
- generated="$generated $gentop" |
5065 |
-@@ -3008,7 +3008,7 @@ EOF |
5066 |
- $show "mkdir $xdir" |
5067 |
- $run mkdir "$xdir" |
5068 |
- status=$? |
5069 |
-- if test $status -ne 0 && test ! -d "$xdir"; then |
5070 |
-+ if test "$status" -ne 0 && test ! -d "$xdir"; then |
5071 |
- exit $status |
5072 |
- fi |
5073 |
- $show "(cd $xdir && $AR x $xabs)" |
5074 |
-@@ -3403,7 +3403,7 @@ static const void *lt_preloaded_setup() |
5075 |
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` |
5076 |
- fi |
5077 |
- |
5078 |
-- if test $need_relink = no || test "$build_libtool_libs" != yes; then |
5079 |
-+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then |
5080 |
- # Replace the output file specification. |
5081 |
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` |
5082 |
- link_command="$compile_command$compile_rpath" |
5083 |
-@@ -3528,7 +3528,7 @@ static const void *lt_preloaded_setup() |
5084 |
- relink_command="$var=\"$var_value\"; export $var; $relink_command" |
5085 |
- fi |
5086 |
- done |
5087 |
-- relink_command="cd `pwd`; $relink_command" |
5088 |
-+ relink_command="(cd `pwd`; $relink_command)" |
5089 |
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
5090 |
- fi |
5091 |
- |
5092 |
-@@ -3771,7 +3771,7 @@ fi\ |
5093 |
- $show "mkdir $gentop" |
5094 |
- $run mkdir "$gentop" |
5095 |
- status=$? |
5096 |
-- if test $status -ne 0 && test ! -d "$gentop"; then |
5097 |
-+ if test "$status" -ne 0 && test ! -d "$gentop"; then |
5098 |
- exit $status |
5099 |
- fi |
5100 |
- generated="$generated $gentop" |
5101 |
-@@ -3791,7 +3791,7 @@ fi\ |
5102 |
- $show "mkdir $xdir" |
5103 |
- $run mkdir "$xdir" |
5104 |
- status=$? |
5105 |
-- if test $status -ne 0 && test ! -d "$xdir"; then |
5106 |
-+ if test "$status" -ne 0 && test ! -d "$xdir"; then |
5107 |
- exit $status |
5108 |
- fi |
5109 |
- $show "(cd $xdir && $AR x $xabs)" |
5110 |
-@@ -3858,7 +3858,7 @@ fi\ |
5111 |
- fi |
5112 |
- done |
5113 |
- # Quote the link command for shipping. |
5114 |
-- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" |
5115 |
-+ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" |
5116 |
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
5117 |
- |
5118 |
- # Only create the output if not a dry run. |
5119 |
-@@ -3948,7 +3948,7 @@ dlpreopen='$dlprefiles' |
5120 |
- |
5121 |
- # Directory that this library needs to be installed in: |
5122 |
- libdir='$install_libdir'" |
5123 |
-- if test "$installed" = no && test $need_relink = yes; then |
5124 |
-+ if test "$installed" = no && test "$need_relink" = yes; then |
5125 |
- $echo >> $output "\ |
5126 |
- relink_command=\"$relink_command\"" |
5127 |
- fi |
5128 |
-@@ -4084,7 +4084,7 @@ relink_command=\"$relink_command\"" |
5129 |
- |
5130 |
- # Not a directory, so check to see that there is only one file specified. |
5131 |
- set dummy $files |
5132 |
-- if test $# -gt 2; then |
5133 |
-+ if test "$#" -gt 2; then |
5134 |
- $echo "$modename: \`$dest' is not a directory" 1>&2 |
5135 |
- $echo "$help" 1>&2 |
5136 |
- exit 1 |
5137 |
-@@ -4186,7 +4186,7 @@ relink_command=\"$relink_command\"" |
5138 |
- $run eval "$striplib $destdir/$realname" || exit $? |
5139 |
- fi |
5140 |
- |
5141 |
-- if test $# -gt 0; then |
5142 |
-+ if test "$#" -gt 0; then |
5143 |
- # Delete the old symlinks, and create new ones. |
5144 |
- for linkname |
5145 |
- do |
5146 |
-@@ -4444,7 +4444,7 @@ relink_command=\"$relink_command\"" |
5147 |
- fi |
5148 |
- |
5149 |
- # Exit here if they wanted silent mode. |
5150 |
-- test "$show" = ":" && exit 0 |
5151 |
-+ test "$show" = : && exit 0 |
5152 |
- |
5153 |
- echo "----------------------------------------------------------------------" |
5154 |
- echo "Libraries have been installed in:" |
5155 |
-@@ -4610,7 +4610,7 @@ relink_command=\"$relink_command\"" |
5156 |
- fi |
5157 |
- |
5158 |
- # Now prepare to actually exec the command. |
5159 |
-- exec_cmd='"$cmd"$args' |
5160 |
-+ exec_cmd="\$cmd$args" |
5161 |
- else |
5162 |
- # Display what would be done. |
5163 |
- if test -n "$shlibpath_var"; then |
5164 |
-@@ -4660,10 +4660,10 @@ relink_command=\"$relink_command\"" |
5165 |
- objdir="$dir/$objdir" |
5166 |
- fi |
5167 |
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` |
5168 |
-- test $mode = uninstall && objdir="$dir" |
5169 |
-+ test "$mode" = uninstall && objdir="$dir" |
5170 |
- |
5171 |
- # Remember objdir for removal later, being careful to avoid duplicates |
5172 |
-- if test $mode = clean; then |
5173 |
-+ if test "$mode" = clean; then |
5174 |
- case " $rmdirs " in |
5175 |
- *" $objdir "*) ;; |
5176 |
- *) rmdirs="$rmdirs $objdir" ;; |
5177 |
-@@ -4695,9 +4695,9 @@ relink_command=\"$relink_command\"" |
5178 |
- rmfiles="$rmfiles $objdir/$n" |
5179 |
- done |
5180 |
- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" |
5181 |
-- test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" |
5182 |
-+ test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" |
5183 |
- |
5184 |
-- if test $mode = uninstall; then |
5185 |
-+ if test "$mode" = uninstall; then |
5186 |
- if test -n "$library_names"; then |
5187 |
- # Do each command in the postuninstall commands. |
5188 |
- eval cmds=\"$postuninstall_cmds\" |
5189 |
-@@ -4706,7 +4706,7 @@ relink_command=\"$relink_command\"" |
5190 |
- IFS="$save_ifs" |
5191 |
- $show "$cmd" |
5192 |
- $run eval "$cmd" |
5193 |
-- if test $? != 0 && test "$rmforce" != yes; then |
5194 |
-+ if test "$?" -ne 0 && test "$rmforce" != yes; then |
5195 |
- exit_status=1 |
5196 |
- fi |
5197 |
- done |
5198 |
-@@ -4721,7 +4721,7 @@ relink_command=\"$relink_command\"" |
5199 |
- IFS="$save_ifs" |
5200 |
- $show "$cmd" |
5201 |
- $run eval "$cmd" |
5202 |
-- if test $? != 0 && test "$rmforce" != yes; then |
5203 |
-+ if test "$?" -ne 0 && test "$rmforce" != yes; then |
5204 |
- exit_status=1 |
5205 |
- fi |
5206 |
- done |
5207 |
-@@ -4741,7 +4741,7 @@ relink_command=\"$relink_command\"" |
5208 |
- |
5209 |
- *) |
5210 |
- # Do a test to see if this is a libtool program. |
5211 |
-- if test $mode = clean && |
5212 |
-+ if test "$mode" = clean && |
5213 |
- (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then |
5214 |
- relink_command= |
5215 |
- . $dir/$file |
5216 |
diff --git a/eclass/ELT-patches/tmp/1.3.5 b/eclass/ELT-patches/tmp/1.3.5 |
5217 |
deleted file mode 100644 |
5218 |
index 29b70e09378d..000000000000 |
5219 |
--- a/eclass/ELT-patches/tmp/1.3.5 |
5220 |
+++ /dev/null |
5221 |
@@ -1,15 +0,0 @@ |
5222 |
---- ltmain.sh Fri Jul 7 18:49:44 2000 |
5223 |
-+++ ltmain.sh Fri May 26 21:53:15 2000 |
5224 |
-@@ -3462,7 +3462,11 @@ |
5225 |
- if test "$finalize" = yes && test -z "$run"; then |
5226 |
- tmpdir="/tmp" |
5227 |
- test -n "$TMPDIR" && tmpdir="$TMPDIR" |
5228 |
-- tmpdir="$tmpdir/libtool-$$" |
5229 |
-+ tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` |
5230 |
-+ if test $? = 0 ; then : |
5231 |
-+ else |
5232 |
-+ tmpdir="$tmpdir/libtool-$$" |
5233 |
-+ fi |
5234 |
- if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : |
5235 |
- else |
5236 |
- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 |
5237 |
diff --git a/eclass/ELT-patches/uclibc-conf/1.2.0 b/eclass/ELT-patches/uclibc-conf/1.2.0 |
5238 |
deleted file mode 100644 |
5239 |
index acd804c8f404..000000000000 |
5240 |
--- a/eclass/ELT-patches/uclibc-conf/1.2.0 |
5241 |
+++ /dev/null |
5242 |
@@ -1,48 +0,0 @@ |
5243 |
---- configure.libltdl~ Fri Jun 11 08:54:04 2004 |
5244 |
-+++ configure Fri Jun 11 08:56:33 2004 |
5245 |
-@@ -1978,6 +1978,11 @@ |
5246 |
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` |
5247 |
- ;; |
5248 |
- |
5249 |
-+linux-uclibc*) |
5250 |
-+ lt_cv_deplibs_check_method=pass_all |
5251 |
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so` |
5252 |
-+ ;; |
5253 |
-+ |
5254 |
- netbsd*) |
5255 |
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
5256 |
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' |
5257 |
-@@ -3030,7 +3035,7 @@ |
5258 |
- |
5259 |
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
5260 |
- case $host_os in |
5261 |
--linux-gnu*) ;; |
5262 |
-+linux-gnu*|linux-uclibc*) ;; |
5263 |
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
5264 |
- esac |
5265 |
- |
5266 |
-@@ -4504,6 +4509,24 @@ |
5267 |
- dynamic_linker='GNU/Linux ld.so' |
5268 |
- ;; |
5269 |
- |
5270 |
-+linux-uclibc*) |
5271 |
-+ version_type=linux |
5272 |
-+ need_lib_prefix=no |
5273 |
-+ need_version=no |
5274 |
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' |
5275 |
-+ soname_spec='${libname}${release}.so$major' |
5276 |
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
5277 |
-+ shlibpath_var=LD_LIBRARY_PATH |
5278 |
-+ shlibpath_overrides_runpath=no |
5279 |
-+ # This implies no fast_install, which is unacceptable. |
5280 |
-+ # Some rework will be needed to allow for fast_install |
5281 |
-+ # before this can be enabled. |
5282 |
-+ # Note: copied from linux-gnu, and may not be appropriate. |
5283 |
-+ hardcode_into_libs=yes |
5284 |
-+ # Assume using the uClibc dynamic linker. |
5285 |
-+ dynamic_linker="uClibc ld.so" |
5286 |
-+ ;; |
5287 |
-+ |
5288 |
- netbsd*) |
5289 |
- version_type=sunos |
5290 |
- need_lib_prefix=no |
5291 |
diff --git a/eclass/ELT-patches/uclibc-conf/1.3.0c b/eclass/ELT-patches/uclibc-conf/1.3.0c |
5292 |
deleted file mode 100644 |
5293 |
index 03efc5dc9c86..000000000000 |
5294 |
--- a/eclass/ELT-patches/uclibc-conf/1.3.0c |
5295 |
+++ /dev/null |
5296 |
@@ -1,48 +0,0 @@ |
5297 |
---- configure.libltdl~ Fri Jun 11 08:54:04 2004 |
5298 |
-+++ configure Fri Jun 11 08:56:33 2004 |
5299 |
-@@ -1978,6 +1978,11 @@ |
5300 |
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` |
5301 |
- ;; |
5302 |
- |
5303 |
-+linux-uclibc*) |
5304 |
-+ lt_cv_deplibs_check_method=pass_all |
5305 |
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so` |
5306 |
-+ ;; |
5307 |
-+ |
5308 |
- netbsd*) |
5309 |
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
5310 |
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' |
5311 |
-@@ -3030,7 +3035,7 @@ |
5312 |
- |
5313 |
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
5314 |
- case "$host_os" in |
5315 |
--linux-gnu*) ;; |
5316 |
-+linux-gnu*|linux-uclibc*) ;; |
5317 |
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
5318 |
- esac |
5319 |
- |
5320 |
-@@ -4504,6 +4509,24 @@ |
5321 |
- dynamic_linker='GNU/Linux ld.so' |
5322 |
- ;; |
5323 |
- |
5324 |
-+linux-uclibc*) |
5325 |
-+ version_type=linux |
5326 |
-+ need_lib_prefix=no |
5327 |
-+ need_version=no |
5328 |
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' |
5329 |
-+ soname_spec='${libname}${release}.so$major' |
5330 |
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
5331 |
-+ shlibpath_var=LD_LIBRARY_PATH |
5332 |
-+ shlibpath_overrides_runpath=no |
5333 |
-+ # This implies no fast_install, which is unacceptable. |
5334 |
-+ # Some rework will be needed to allow for fast_install |
5335 |
-+ # before this can be enabled. |
5336 |
-+ # Note: copied from linux-gnu, and may not be appropriate. |
5337 |
-+ hardcode_into_libs=yes |
5338 |
-+ # Assume using the uClibc dynamic linker. |
5339 |
-+ dynamic_linker="uClibc ld.so" |
5340 |
-+ ;; |
5341 |
-+ |
5342 |
- netbsd*) |
5343 |
- version_type=sunos |
5344 |
- need_lib_prefix=no |
5345 |
diff --git a/eclass/ELT-patches/uclibc-ltconf/1.2.0 b/eclass/ELT-patches/uclibc-ltconf/1.2.0 |
5346 |
deleted file mode 100644 |
5347 |
index bbc6bc96571b..000000000000 |
5348 |
--- a/eclass/ELT-patches/uclibc-ltconf/1.2.0 |
5349 |
+++ /dev/null |
5350 |
@@ -1,36 +0,0 @@ |
5351 |
---- ltconfig.uclibc 2004-01-14 22:07:42.000000000 +0100 |
5352 |
-+++ ltconfig 2004-03-10 15:43:37.000000000 +0100 |
5353 |
-@@ -603,6 +603,7 @@ |
5354 |
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
5355 |
- case $host_os in |
5356 |
- linux-gnu*) ;; |
5357 |
-+linux-uclibc*) ;; |
5358 |
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
5359 |
- esac |
5360 |
- |
5361 |
-@@ -1259,6 +1260,25 @@ |
5362 |
- fi |
5363 |
- ;; |
5364 |
- |
5365 |
-+linux-uclibc*) |
5366 |
-+ version_type=linux |
5367 |
-+ need_lib_prefix=no |
5368 |
-+ need_version=no |
5369 |
-+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' |
5370 |
-+ soname_spec='${libname}${release}.so.$major' |
5371 |
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
5372 |
-+ shlibpath_var=LD_LIBRARY_PATH |
5373 |
-+ shlibpath_overrides_runpath=no |
5374 |
-+ deplibs_check_method=pass_all |
5375 |
-+ # This implies no fast_install, which is unacceptable. |
5376 |
-+ # Some rework will be needed to allow for fast_install |
5377 |
-+ # before this can be enabled. |
5378 |
-+ # Note: copied from linux-gnu, and may not be appropriate. |
5379 |
-+ hardcode_into_libs=yes |
5380 |
-+ # Assume using the uClibc dynamic linker. |
5381 |
-+ dynamic_linker="uClibc ld.so" |
5382 |
-+ ;; |
5383 |
-+ |
5384 |
- netbsd* | openbsd*) |
5385 |
- version_type=sunos |
5386 |
- library_names_spec='${libname}${release}.so.$versuffix' |
5387 |
diff --git a/eclass/ELT-patches/uclibc-ltconf/1.3.0 b/eclass/ELT-patches/uclibc-ltconf/1.3.0 |
5388 |
deleted file mode 100644 |
5389 |
index 0a5a9ead8f0c..000000000000 |
5390 |
--- a/eclass/ELT-patches/uclibc-ltconf/1.3.0 |
5391 |
+++ /dev/null |
5392 |
@@ -1,39 +0,0 @@ |
5393 |
---- ltconfig.uclibc 2004-01-14 22:07:42.000000000 +0100 |
5394 |
-+++ ltconfig 2004-03-10 15:43:37.000000000 +0100 |
5395 |
-@@ -603,6 +603,7 @@ |
5396 |
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
5397 |
- case $host_os in |
5398 |
- linux-gnu*) ;; |
5399 |
-+linux-uclibc*) ;; |
5400 |
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
5401 |
- esac |
5402 |
- |
5403 |
-@@ -1259,6 +1260,28 @@ |
5404 |
- dynamic_linker='GNU/Linux ld.so' |
5405 |
- ;; |
5406 |
- |
5407 |
-+linux-uclibc*) |
5408 |
-+ version_type=linux |
5409 |
-+ need_lib_prefix=no |
5410 |
-+ need_version=no |
5411 |
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' |
5412 |
-+ soname_spec='${libname}${release}.so$major' |
5413 |
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
5414 |
-+ shlibpath_var=LD_LIBRARY_PATH |
5415 |
-+ shlibpath_overrides_runpath=no |
5416 |
-+ # deplibs_check_method=pass_all |
5417 |
-+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' |
5418 |
-+ file_magic_cmd=/usr/bin/file |
5419 |
-+ file_magic_test_file=`echo /lib/libuClibc-*.so` |
5420 |
-+ # This implies no fast_install, which is unacceptable. |
5421 |
-+ # Some rework will be needed to allow for fast_install |
5422 |
-+ # before this can be enabled. |
5423 |
-+ # Note: copied from linux-gnu, and may not be appropriate. |
5424 |
-+ hardcode_into_libs=yes |
5425 |
-+ # Assume using the uClibc dynamic linker. |
5426 |
-+ dynamic_linker="uClibc ld.so" |
5427 |
-+ ;; |
5428 |
-+ |
5429 |
- netbsd*) |
5430 |
- need_lib_prefix=no |
5431 |
- need_version=no |
5432 |
-- |
5433 |
2.12.0 |