1 |
commit: ad9cdc2324f0009a95f97ed4d352b6ba7a9c9f9a |
2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
3 |
AuthorDate: Fri Apr 27 05:11:49 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 27 10:32:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ad9cdc23 |
7 |
|
8 |
dev-lang/rust: reorganize patchsets for upcoming rust-1.25.0 |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
|
12 |
...Explicitly-run-perl-for-OpenSSL-Configure.patch | 0 |
13 |
...bs-for-dependent-crates-when-linking-stat.patch | 0 |
14 |
...ndency-resolution-errors-to-be-more-consi.patch | 0 |
15 |
...tic-native-libraries-when-linking-static-.patch | 0 |
16 |
...-nostdlib-and-musl_root-from-musl-targets.patch | 0 |
17 |
...-Prefer-libgcc_eh-over-libunwind-for-musl.patch | 0 |
18 |
.../files/{ => 1.21.0}/0007-Fix-LLVM-build.patch | 0 |
19 |
...dd-openssl-configuration-for-musl-targets.patch | 0 |
20 |
.../rust/files/{ => 1.21.0}/0009-liblibc.patch | 0 |
21 |
.../{ => 1.21.0}/0010-static-linking-default.patch | 0 |
22 |
.../llvm4-musl-fixes.patch} | 0 |
23 |
...tic-native-libraries-when-linking-static-.patch | 0 |
24 |
...-nostdlib-and-musl_root-from-musl-targets.patch | 0 |
25 |
...sl-targets-to-link-dynamically-by-default.patch | 0 |
26 |
...-Prefer-libgcc_eh-over-libunwind-for-musl.patch | 0 |
27 |
.../files/{ => 1.23.0}/0005-Fix-LLVM-build.patch | 0 |
28 |
.../0006-Fix-rustdoc-for-cross-targets.patch | 0 |
29 |
...dd-openssl-configuration-for-musl-targets.patch | 0 |
30 |
.../0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch | 0 |
31 |
.../rust/files/{ => 1.23.0}/0009-liblibc.patch | 0 |
32 |
.../llvm4-musl-fixes.patch} | 0 |
33 |
dev-lang/rust/rust-1.21.0.ebuild | 22 +++++++++++----------- |
34 |
dev-lang/rust/rust-1.23.0-r1.ebuild | 20 ++++++++++---------- |
35 |
dev-lang/rust/rust-1.23.0.ebuild | 20 ++++++++++---------- |
36 |
24 files changed, 31 insertions(+), 31 deletions(-) |
37 |
|
38 |
diff --git a/dev-lang/rust/files/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch b/dev-lang/rust/files/1.21.0/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch |
39 |
similarity index 100% |
40 |
rename from dev-lang/rust/files/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch |
41 |
rename to dev-lang/rust/files/1.21.0/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch |
42 |
|
43 |
diff --git a/dev-lang/rust/files/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch b/dev-lang/rust/files/1.21.0/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch |
44 |
similarity index 100% |
45 |
rename from dev-lang/rust/files/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch |
46 |
rename to dev-lang/rust/files/1.21.0/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch |
47 |
|
48 |
diff --git a/dev-lang/rust/files/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch b/dev-lang/rust/files/1.21.0/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch |
49 |
similarity index 100% |
50 |
rename from dev-lang/rust/files/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch |
51 |
rename to dev-lang/rust/files/1.21.0/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch |
52 |
|
53 |
diff --git a/dev-lang/rust/files/0004-Require-static-native-libraries-when-linking-static-.patch b/dev-lang/rust/files/1.21.0/0004-Require-static-native-libraries-when-linking-static-.patch |
54 |
similarity index 100% |
55 |
rename from dev-lang/rust/files/0004-Require-static-native-libraries-when-linking-static-.patch |
56 |
rename to dev-lang/rust/files/1.21.0/0004-Require-static-native-libraries-when-linking-static-.patch |
57 |
|
58 |
diff --git a/dev-lang/rust/files/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/dev-lang/rust/files/1.21.0/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch |
59 |
similarity index 100% |
60 |
rename from dev-lang/rust/files/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch |
61 |
rename to dev-lang/rust/files/1.21.0/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch |
62 |
|
63 |
diff --git a/dev-lang/rust/files/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/dev-lang/rust/files/1.21.0/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch |
64 |
similarity index 100% |
65 |
rename from dev-lang/rust/files/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch |
66 |
rename to dev-lang/rust/files/1.21.0/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch |
67 |
|
68 |
diff --git a/dev-lang/rust/files/0007-Fix-LLVM-build.patch b/dev-lang/rust/files/1.21.0/0007-Fix-LLVM-build.patch |
69 |
similarity index 100% |
70 |
rename from dev-lang/rust/files/0007-Fix-LLVM-build.patch |
71 |
rename to dev-lang/rust/files/1.21.0/0007-Fix-LLVM-build.patch |
72 |
|
73 |
diff --git a/dev-lang/rust/files/0008-Add-openssl-configuration-for-musl-targets.patch b/dev-lang/rust/files/1.21.0/0008-Add-openssl-configuration-for-musl-targets.patch |
74 |
similarity index 100% |
75 |
rename from dev-lang/rust/files/0008-Add-openssl-configuration-for-musl-targets.patch |
76 |
rename to dev-lang/rust/files/1.21.0/0008-Add-openssl-configuration-for-musl-targets.patch |
77 |
|
78 |
diff --git a/dev-lang/rust/files/0009-liblibc.patch b/dev-lang/rust/files/1.21.0/0009-liblibc.patch |
79 |
similarity index 100% |
80 |
copy from dev-lang/rust/files/0009-liblibc.patch |
81 |
copy to dev-lang/rust/files/1.21.0/0009-liblibc.patch |
82 |
|
83 |
diff --git a/dev-lang/rust/files/0010-static-linking-default.patch b/dev-lang/rust/files/1.21.0/0010-static-linking-default.patch |
84 |
similarity index 100% |
85 |
rename from dev-lang/rust/files/0010-static-linking-default.patch |
86 |
rename to dev-lang/rust/files/1.21.0/0010-static-linking-default.patch |
87 |
|
88 |
diff --git a/dev-lang/rust/files/llvm-musl-fixes.patch b/dev-lang/rust/files/1.21.0/llvm4-musl-fixes.patch |
89 |
similarity index 100% |
90 |
copy from dev-lang/rust/files/llvm-musl-fixes.patch |
91 |
copy to dev-lang/rust/files/1.21.0/llvm4-musl-fixes.patch |
92 |
|
93 |
diff --git a/dev-lang/rust/files/0001-Require-static-native-libraries-when-linking-static-.patch b/dev-lang/rust/files/1.23.0/0001-Require-static-native-libraries-when-linking-static-.patch |
94 |
similarity index 100% |
95 |
rename from dev-lang/rust/files/0001-Require-static-native-libraries-when-linking-static-.patch |
96 |
rename to dev-lang/rust/files/1.23.0/0001-Require-static-native-libraries-when-linking-static-.patch |
97 |
|
98 |
diff --git a/dev-lang/rust/files/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/dev-lang/rust/files/1.23.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch |
99 |
similarity index 100% |
100 |
rename from dev-lang/rust/files/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch |
101 |
rename to dev-lang/rust/files/1.23.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch |
102 |
|
103 |
diff --git a/dev-lang/rust/files/0003-Switch-musl-targets-to-link-dynamically-by-default.patch b/dev-lang/rust/files/1.23.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch |
104 |
similarity index 100% |
105 |
rename from dev-lang/rust/files/0003-Switch-musl-targets-to-link-dynamically-by-default.patch |
106 |
rename to dev-lang/rust/files/1.23.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch |
107 |
|
108 |
diff --git a/dev-lang/rust/files/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/dev-lang/rust/files/1.23.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch |
109 |
similarity index 100% |
110 |
rename from dev-lang/rust/files/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch |
111 |
rename to dev-lang/rust/files/1.23.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch |
112 |
|
113 |
diff --git a/dev-lang/rust/files/0005-Fix-LLVM-build.patch b/dev-lang/rust/files/1.23.0/0005-Fix-LLVM-build.patch |
114 |
similarity index 100% |
115 |
rename from dev-lang/rust/files/0005-Fix-LLVM-build.patch |
116 |
rename to dev-lang/rust/files/1.23.0/0005-Fix-LLVM-build.patch |
117 |
|
118 |
diff --git a/dev-lang/rust/files/0006-Fix-rustdoc-for-cross-targets.patch b/dev-lang/rust/files/1.23.0/0006-Fix-rustdoc-for-cross-targets.patch |
119 |
similarity index 100% |
120 |
rename from dev-lang/rust/files/0006-Fix-rustdoc-for-cross-targets.patch |
121 |
rename to dev-lang/rust/files/1.23.0/0006-Fix-rustdoc-for-cross-targets.patch |
122 |
|
123 |
diff --git a/dev-lang/rust/files/0007-Add-openssl-configuration-for-musl-targets.patch b/dev-lang/rust/files/1.23.0/0007-Add-openssl-configuration-for-musl-targets.patch |
124 |
similarity index 100% |
125 |
rename from dev-lang/rust/files/0007-Add-openssl-configuration-for-musl-targets.patch |
126 |
rename to dev-lang/rust/files/1.23.0/0007-Add-openssl-configuration-for-musl-targets.patch |
127 |
|
128 |
diff --git a/dev-lang/rust/files/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch b/dev-lang/rust/files/1.23.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch |
129 |
similarity index 100% |
130 |
rename from dev-lang/rust/files/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch |
131 |
rename to dev-lang/rust/files/1.23.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch |
132 |
|
133 |
diff --git a/dev-lang/rust/files/0009-liblibc.patch b/dev-lang/rust/files/1.23.0/0009-liblibc.patch |
134 |
similarity index 100% |
135 |
rename from dev-lang/rust/files/0009-liblibc.patch |
136 |
rename to dev-lang/rust/files/1.23.0/0009-liblibc.patch |
137 |
|
138 |
diff --git a/dev-lang/rust/files/llvm-musl-fixes.patch b/dev-lang/rust/files/1.23.0/llvm4-musl-fixes.patch |
139 |
similarity index 100% |
140 |
rename from dev-lang/rust/files/llvm-musl-fixes.patch |
141 |
rename to dev-lang/rust/files/1.23.0/llvm4-musl-fixes.patch |
142 |
|
143 |
diff --git a/dev-lang/rust/rust-1.21.0.ebuild b/dev-lang/rust/rust-1.21.0.ebuild |
144 |
index 3140b1d..1dab345 100644 |
145 |
--- a/dev-lang/rust/rust-1.21.0.ebuild |
146 |
+++ b/dev-lang/rust/rust-1.21.0.ebuild |
147 |
@@ -86,17 +86,17 @@ PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425 |
148 |
dev-util/cargo" |
149 |
|
150 |
PATCHES=( |
151 |
- "${FILESDIR}/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch" |
152 |
- "${FILESDIR}/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch" |
153 |
- "${FILESDIR}/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch" |
154 |
- "${FILESDIR}/0004-Require-static-native-libraries-when-linking-static-.patch" |
155 |
- "${FILESDIR}/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch" |
156 |
- "${FILESDIR}/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch" |
157 |
- "${FILESDIR}/0007-Fix-LLVM-build.patch" |
158 |
- "${FILESDIR}/0008-Add-openssl-configuration-for-musl-targets.patch" |
159 |
- "${FILESDIR}/0009-liblibc.patch" |
160 |
- "${FILESDIR}/0010-static-linking-default.patch" |
161 |
- "${FILESDIR}/llvm-musl-fixes.patch" |
162 |
+ "${FILESDIR}/1.21.0/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch" |
163 |
+ "${FILESDIR}/1.21.0/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch" |
164 |
+ "${FILESDIR}/1.21.0/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch" |
165 |
+ "${FILESDIR}/1.21.0/0004-Require-static-native-libraries-when-linking-static-.patch" |
166 |
+ "${FILESDIR}/1.21.0/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch" |
167 |
+ "${FILESDIR}/1.21.0/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch" |
168 |
+ "${FILESDIR}/1.21.0/0007-Fix-LLVM-build.patch" |
169 |
+ "${FILESDIR}/1.21.0/0008-Add-openssl-configuration-for-musl-targets.patch" |
170 |
+ "${FILESDIR}/1.21.0/0009-liblibc.patch" |
171 |
+ "${FILESDIR}/1.21.0/0010-static-linking-default.patch" |
172 |
+ "${FILESDIR}/1.21.0/llvm4-musl-fixes.patch" |
173 |
) |
174 |
|
175 |
S="${WORKDIR}/${MY_P}-src" |
176 |
|
177 |
diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild b/dev-lang/rust/rust-1.23.0-r1.ebuild |
178 |
index caf1009..935c6ba 100644 |
179 |
--- a/dev-lang/rust/rust-1.23.0-r1.ebuild |
180 |
+++ b/dev-lang/rust/rust-1.23.0-r1.ebuild |
181 |
@@ -103,16 +103,16 @@ PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )" |
182 |
|
183 |
PATCHES=( |
184 |
"${FILESDIR}/1.23.0-separate-libdir.patch" |
185 |
- "${FILESDIR}/0001-Require-static-native-libraries-when-linking-static-.patch" |
186 |
- "${FILESDIR}/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch" |
187 |
- "${FILESDIR}/0003-Switch-musl-targets-to-link-dynamically-by-default.patch" |
188 |
- "${FILESDIR}/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch" |
189 |
- "${FILESDIR}/0005-Fix-LLVM-build.patch" |
190 |
- "${FILESDIR}/0006-Fix-rustdoc-for-cross-targets.patch" |
191 |
- "${FILESDIR}/0007-Add-openssl-configuration-for-musl-targets.patch" |
192 |
- "${FILESDIR}/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch" |
193 |
- "${FILESDIR}/0009-liblibc.patch" |
194 |
- "${FILESDIR}/llvm-musl-fixes.patch" |
195 |
+ "${FILESDIR}/1.23.0/0001-Require-static-native-libraries-when-linking-static-.patch" |
196 |
+ "${FILESDIR}/1.23.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch" |
197 |
+ "${FILESDIR}/1.23.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch" |
198 |
+ "${FILESDIR}/1.23.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch" |
199 |
+ "${FILESDIR}/1.23.0/0005-Fix-LLVM-build.patch" |
200 |
+ "${FILESDIR}/1.23.0/0006-Fix-rustdoc-for-cross-targets.patch" |
201 |
+ "${FILESDIR}/1.23.0/0007-Add-openssl-configuration-for-musl-targets.patch" |
202 |
+ "${FILESDIR}/1.23.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch" |
203 |
+ "${FILESDIR}/1.23.0/0009-liblibc.patch" |
204 |
+ "${FILESDIR}/1.23.0/llvm4-musl-fixes.patch" |
205 |
) |
206 |
|
207 |
S="${WORKDIR}/${MY_P}-src" |
208 |
|
209 |
diff --git a/dev-lang/rust/rust-1.23.0.ebuild b/dev-lang/rust/rust-1.23.0.ebuild |
210 |
index 0153f9a..2a81e3a 100644 |
211 |
--- a/dev-lang/rust/rust-1.23.0.ebuild |
212 |
+++ b/dev-lang/rust/rust-1.23.0.ebuild |
213 |
@@ -90,16 +90,16 @@ DEPEND="${RDEPEND} |
214 |
PDEPEND=">=dev-util/cargo-${CARGO_DEPEND_VERSION}" |
215 |
|
216 |
PATCHES=( |
217 |
- "${FILESDIR}/0001-Require-static-native-libraries-when-linking-static-.patch" |
218 |
- "${FILESDIR}/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch" |
219 |
- "${FILESDIR}/0003-Switch-musl-targets-to-link-dynamically-by-default.patch" |
220 |
- "${FILESDIR}/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch" |
221 |
- "${FILESDIR}/0005-Fix-LLVM-build.patch" |
222 |
- "${FILESDIR}/0006-Fix-rustdoc-for-cross-targets.patch" |
223 |
- "${FILESDIR}/0007-Add-openssl-configuration-for-musl-targets.patch" |
224 |
- "${FILESDIR}/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch" |
225 |
- "${FILESDIR}/0009-liblibc.patch" |
226 |
- "${FILESDIR}/llvm-musl-fixes.patch" |
227 |
+ "${FILESDIR}/1.23.0/0001-Require-static-native-libraries-when-linking-static-.patch" |
228 |
+ "${FILESDIR}/1.23.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch" |
229 |
+ "${FILESDIR}/1.23.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch" |
230 |
+ "${FILESDIR}/1.23.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch" |
231 |
+ "${FILESDIR}/1.23.0/0005-Fix-LLVM-build.patch" |
232 |
+ "${FILESDIR}/1.23.0/0006-Fix-rustdoc-for-cross-targets.patch" |
233 |
+ "${FILESDIR}/1.23.0/0007-Add-openssl-configuration-for-musl-targets.patch" |
234 |
+ "${FILESDIR}/1.23.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch" |
235 |
+ "${FILESDIR}/1.23.0/0009-liblibc.patch" |
236 |
+ "${FILESDIR}/1.23.0/llvm4-musl-fixes.patch" |
237 |
) |
238 |
|
239 |
S="${WORKDIR}/${MY_P}-src" |