Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/rust-std/
Date: Thu, 13 Jan 2022 21:37:31
Message-Id: 1642108155.16d780eadc15ea8b6a88c97688a669e128587991.gyakovlev@gentoo
1 commit: 16d780eadc15ea8b6a88c97688a669e128587991
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 13 21:08:53 2022 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 13 21:09:15 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d780ea
7
8 sys-devel/rust-std: drop 1.51.0, 1.52.1
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 sys-devel/rust-std/Manifest | 2 -
13 sys-devel/rust-std/rust-std-1.51.0.ebuild | 156 ------------------------------
14 sys-devel/rust-std/rust-std-1.52.1.ebuild | 154 -----------------------------
15 3 files changed, 312 deletions(-)
16
17 diff --git a/sys-devel/rust-std/Manifest b/sys-devel/rust-std/Manifest
18 index d255219d8cb9..408325747f02 100644
19 --- a/sys-devel/rust-std/Manifest
20 +++ b/sys-devel/rust-std/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST rustc-1.51.0-src.tar.xz 109596164 BLAKE2B c1ac89655adfe7db8005476d42c748cf1896f52888141229fd6dda43855dbb08c21c8e1f11398d2f1f9dd5f8d508d9158a3bda4f1b282d1b184ea4c701100837 SHA512 ded91468ddf3e6627f00e7ec3d44452aa24eb727a183c0de9d90264f593119a54300d56b09251a88260db480b48554181ae195c538996a32d68d48b6587ac0df
23 -DIST rustc-1.52.1-src.tar.xz 115109508 BLAKE2B c5d73f5884037d287d88ba9fdaf63a36678b692e1b510920045797ab29f1660f05cda901e19411ff83ec3084c4130034c269976b1056220f3e629cff116d07f0 SHA512 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c
24 DIST rustc-1.53.0-src.tar.xz 115686332 BLAKE2B fa068f89d42f927fdc79ee31aad1386eaf2aa596a060e059c5a1a73fe48c48d008fc952cd6c7912b743e41d77a94b205639eed0f728b2539b62f18a772cabfe3 SHA512 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
25 DIST rustc-1.54.0-src.tar.xz 116286856 BLAKE2B 5ac47822646a0b6205f09282168b4d4ddcace9f6bc8f242c890327ca4074626f129514f8bcae5c5556015745f718990cce490658076f5cd3526623439540416b SHA512 5162f85b43ca2c5af93fdbfb2597d75df8a838f7fcc025a5298499ce1043db50f1ea2fbba753e47ce5daad3d80d4b612acf6527ef902c34117763e687fdbbcfa
26 DIST rustc-1.55.0-src.tar.xz 117197580 BLAKE2B 8d9739ce7571146aee0e07c6287de9a8c4f1a914606cd47819eb1ef118b15772ecf22d0d43d7732f03c234a013fa54a4a7f0578a3f136af518f71bf64a03305d SHA512 7522f2fa95d5af92472404ecc97d7d9e745e88c933196a83fa373ce1efff6db3c295e0e2afdbfa1ff00644554efa0c3c7f6c11f9119ecf9010cb440b3f27c2da
27
28 diff --git a/sys-devel/rust-std/rust-std-1.51.0.ebuild b/sys-devel/rust-std/rust-std-1.51.0.ebuild
29 deleted file mode 100644
30 index 935388d41a01..000000000000
31 --- a/sys-devel/rust-std/rust-std-1.51.0.ebuild
32 +++ /dev/null
33 @@ -1,156 +0,0 @@
34 -# Copyright 2020-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_{7,8,9} )
40 -
41 -inherit flag-o-matic multiprocessing python-any-r1 rust-toolchain toolchain-funcs
42 -
43 -DESCRIPTION="Rust standard library, standalone (for crossdev)"
44 -HOMEPAGE="https://www.rust-lang.org"
45 -SRC_URI="https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz"
46 -
47 -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
48 -SLOT="stable/$(ver_cut 1-2)"
49 -# please do not keyword
50 -#KEYWORDS="" #nowarn
51 -IUSE="debug"
52 -
53 -BDEPEND="
54 - ${PYTHON_DEPS}
55 - ~dev-lang/rust-${PV}:=
56 -"
57 -
58 -DEPEND="||
59 - (
60 - >="${CATEGORY}"/gcc-4.7:*
61 - >="${CATEGORY}"/clang-3.5:*
62 - )
63 -"
64 -
65 -RDEPEND="${DEPEND}"
66 -
67 -# need full compiler to run tests
68 -RESTRICT="test"
69 -
70 -QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
71 -
72 -S="${WORKDIR}/${P/-std/c}-src"
73 -
74 -PATCHES=( "${FILESDIR}"/1.51.0-bootstrap-panic.patch )
75 -
76 -#
77 -# The cross magic
78 -#
79 -export CTARGET=${CTARGET:-${CHOST}}
80 -if [[ ${CTARGET} == ${CHOST} ]] ; then
81 - if [[ ${CATEGORY} == cross-* ]] ; then
82 - export CTARGET=${CATEGORY#cross-}
83 - fi
84 -fi
85 -
86 -is_cross() {
87 - [[ ${CHOST} != ${CTARGET} ]]
88 -}
89 -
90 -toml_usex() {
91 - usex "$1" true false
92 -}
93 -
94 -pkg_pretend() {
95 - is_cross || die "${PN} should only be used for cross"
96 -}
97 -
98 -pkg_setup() {
99 - python-any-r1_pkg_setup
100 -}
101 -
102 -src_prepare() {
103 - default
104 -}
105 -
106 -src_configure() {
107 - # do the great cleanup
108 - strip-flags
109 - filter-flags '-mcpu=*' '-march=*' '-mtune=*' '-m32' '-m64'
110 - strip-unsupported-flags
111 -
112 - local rust_root x
113 - rust_root="$(rustc --print sysroot)"
114 - rtarget="$(rust_abi ${CTARGET})"
115 - rtarget="${ERUST_STD_RTARGET:-${rtarget}}" # some targets need to be custom.
116 - rbuild="$(rust_abi ${CBUILD})"
117 - rhost="$(rust_abi ${CHOST})"
118 -
119 - echo
120 - for x in CATEGORY rust_root rbuild rhost rtarget RUSTFLAGS CFLAGS CXXFLAGS LDFLAGS; do
121 - einfo "$(printf '%10s' ${x^^}:) ${!x}"
122 - done
123 -
124 - cat <<- EOF > "${S}"/config.toml
125 - [build]
126 - build = "${rbuild}"
127 - host = ["${rhost}"]
128 - target = ["${rtarget}"]
129 - cargo = "${rust_root}/bin/cargo"
130 - rustc = "${rust_root}/bin/rustc"
131 - submodules = false
132 - python = "${EPYTHON}"
133 - locked-deps = true
134 - vendor = true
135 - extended = true
136 - verbose = 2
137 - cargo-native-static = false
138 - [install]
139 - prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
140 - sysconfdir = "etc"
141 - docdir = "share/doc/rust"
142 - bindir = "bin"
143 - libdir = "lib"
144 - mandir = "share/man"
145 - [rust]
146 - # https://github.com/rust-lang/rust/issues/54872
147 - codegen-units-std = 1
148 - optimize = true
149 - debug = $(toml_usex debug)
150 - debug-assertions = $(toml_usex debug)
151 - debuginfo-level-rustc = 0
152 - backtrace = true
153 - incremental = false
154 - default-linker = "$(tc-getCC)"
155 - rpath = false
156 - dist-src = false
157 - remap-debuginfo = true
158 - jemalloc = false
159 - [dist]
160 - src-tarball = false
161 - [target.${rtarget}]
162 - cc = "$(tc-getCC ${CTARGET})"
163 - cxx = "$(tc-getCXX ${CTARGET})"
164 - linker = "$(tc-getCC ${CTARGET})"
165 - ar = "$(tc-getAR ${CTARGET})"
166 - $(usex elibc_musl 'crt-static = false' '')
167 - EOF
168 -
169 - einfo "${PN^} configured with the following settings:"
170 - cat "${S}"/config.toml || die
171 -}
172 -
173 -src_compile() {
174 - env RUST_BACKTRACE=1 \
175 - "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
176 - library/std --stage 0 || die
177 -}
178 -
179 -src_test() {
180 - ewarn "${PN} can't run tests"
181 -}
182 -
183 -src_install() {
184 - local rustlib="lib/rust/${PV}/lib/rustlib"
185 - dodir "/usr/${rustlib}"
186 - pushd "build/${rhost}/stage0-sysroot/lib/rustlib" > /dev/null || die
187 - cp -pPRv "${rtarget}" "${ED}/usr/${rustlib}" || die
188 - popd > /dev/null || die
189 -}
190
191 diff --git a/sys-devel/rust-std/rust-std-1.52.1.ebuild b/sys-devel/rust-std/rust-std-1.52.1.ebuild
192 deleted file mode 100644
193 index 7ca481644a6a..000000000000
194 --- a/sys-devel/rust-std/rust-std-1.52.1.ebuild
195 +++ /dev/null
196 @@ -1,154 +0,0 @@
197 -# Copyright 2020-2021 Gentoo Authors
198 -# Distributed under the terms of the GNU General Public License v2
199 -
200 -EAPI=7
201 -
202 -PYTHON_COMPAT=( python3_{7,8,9} )
203 -
204 -inherit flag-o-matic multiprocessing python-any-r1 rust-toolchain toolchain-funcs
205 -
206 -DESCRIPTION="Rust standard library, standalone (for crossdev)"
207 -HOMEPAGE="https://www.rust-lang.org"
208 -SRC_URI="https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz"
209 -
210 -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
211 -SLOT="stable/$(ver_cut 1-2)"
212 -# please do not keyword
213 -#KEYWORDS="" #nowarn
214 -IUSE="debug"
215 -
216 -BDEPEND="
217 - ${PYTHON_DEPS}
218 - ~dev-lang/rust-${PV}:=
219 -"
220 -
221 -DEPEND="||
222 - (
223 - >="${CATEGORY}"/gcc-4.7:*
224 - >="${CATEGORY}"/clang-3.5:*
225 - )
226 -"
227 -
228 -RDEPEND="${DEPEND}"
229 -
230 -# need full compiler to run tests
231 -RESTRICT="test"
232 -
233 -QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
234 -
235 -S="${WORKDIR}/${P/-std/c}-src"
236 -
237 -#
238 -# The cross magic
239 -#
240 -export CTARGET=${CTARGET:-${CHOST}}
241 -if [[ ${CTARGET} == ${CHOST} ]] ; then
242 - if [[ ${CATEGORY} == cross-* ]] ; then
243 - export CTARGET=${CATEGORY#cross-}
244 - fi
245 -fi
246 -
247 -is_cross() {
248 - [[ ${CHOST} != ${CTARGET} ]]
249 -}
250 -
251 -toml_usex() {
252 - usex "$1" true false
253 -}
254 -
255 -pkg_pretend() {
256 - is_cross || die "${PN} should only be used for cross"
257 -}
258 -
259 -pkg_setup() {
260 - python-any-r1_pkg_setup
261 -}
262 -
263 -src_prepare() {
264 - default
265 -}
266 -
267 -src_configure() {
268 - # do the great cleanup
269 - strip-flags
270 - filter-flags '-mcpu=*' '-march=*' '-mtune=*' '-m32' '-m64'
271 - strip-unsupported-flags
272 -
273 - local rust_root x
274 - rust_root="$(rustc --print sysroot)"
275 - rtarget="$(rust_abi ${CTARGET})"
276 - rtarget="${ERUST_STD_RTARGET:-${rtarget}}" # some targets need to be custom.
277 - rbuild="$(rust_abi ${CBUILD})"
278 - rhost="$(rust_abi ${CHOST})"
279 -
280 - echo
281 - for x in CATEGORY rust_root rbuild rhost rtarget RUSTFLAGS CFLAGS CXXFLAGS LDFLAGS; do
282 - einfo "$(printf '%10s' ${x^^}:) ${!x}"
283 - done
284 -
285 - cat <<- EOF > "${S}"/config.toml
286 - [build]
287 - build = "${rbuild}"
288 - host = ["${rhost}"]
289 - target = ["${rtarget}"]
290 - cargo = "${rust_root}/bin/cargo"
291 - rustc = "${rust_root}/bin/rustc"
292 - submodules = false
293 - python = "${EPYTHON}"
294 - locked-deps = true
295 - vendor = true
296 - extended = true
297 - verbose = 2
298 - cargo-native-static = false
299 - [install]
300 - prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
301 - sysconfdir = "etc"
302 - docdir = "share/doc/rust"
303 - bindir = "bin"
304 - libdir = "lib"
305 - mandir = "share/man"
306 - [rust]
307 - # https://github.com/rust-lang/rust/issues/54872
308 - codegen-units-std = 1
309 - optimize = true
310 - debug = $(toml_usex debug)
311 - debug-assertions = $(toml_usex debug)
312 - debuginfo-level-rustc = 0
313 - backtrace = true
314 - incremental = false
315 - default-linker = "$(tc-getCC)"
316 - rpath = false
317 - dist-src = false
318 - remap-debuginfo = true
319 - jemalloc = false
320 - [dist]
321 - src-tarball = false
322 - [target.${rtarget}]
323 - cc = "$(tc-getCC ${CTARGET})"
324 - cxx = "$(tc-getCXX ${CTARGET})"
325 - linker = "$(tc-getCC ${CTARGET})"
326 - ar = "$(tc-getAR ${CTARGET})"
327 - $(usex elibc_musl 'crt-static = false' '')
328 - EOF
329 -
330 - einfo "${PN^} configured with the following settings:"
331 - cat "${S}"/config.toml || die
332 -}
333 -
334 -src_compile() {
335 - env RUST_BACKTRACE=1 \
336 - "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
337 - library/std --stage 0 || die
338 -}
339 -
340 -src_test() {
341 - ewarn "${PN} can't run tests"
342 -}
343 -
344 -src_install() {
345 - local rustlib="lib/rust/${PV}/lib/rustlib"
346 - dodir "/usr/${rustlib}"
347 - pushd "build/${rhost}/stage0-sysroot/lib/rustlib" > /dev/null || die
348 - cp -pPRv "${rtarget}" "${ED}/usr/${rustlib}" || die
349 - popd > /dev/null || die
350 -}