Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 777068 Details for
Bug 760405
dev-lang/rust-bin-1.47.0-r1: claims to support x32 ABI but that's not the case
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
rust-bin ebuild patch adding x32 target rustlib
rust-bin-1.60.0.ebuild-x32.patch (text/plain), 2.34 KB, created by
Steven Newbury
on 2022-05-06 15:53:35 UTC
(
hide
)
Description:
rust-bin ebuild patch adding x32 target rustlib
Filename:
MIME Type:
Creator:
Steven Newbury
Created:
2022-05-06 15:53:35 UTC
Size:
2.34 KB
patch
obsolete
>--- /usr/portage/dev-lang/rust-bin/rust-bin-1.60.0.ebuild 2022-04-25 19:40:01.000000000 +0100 >+++ rust-bin-1.60.0.ebuild 2022-05-06 16:45:48.848397713 +0100 >@@ -12,6 +12,7 @@ > DESCRIPTION="Systems programming language from Mozilla" > HOMEPAGE="https://www.rust-lang.org/" > SRC_URI="$(rust_all_arch_uris ${MY_P}) >+ abi_x86_x32? ( "${RUST_TOOLCHAIN_BASEURL%/}/2022-04-07/rust-std-${PV}-x86_64-unknown-linux-gnux32.tar.xz" ) > rust-src? ( ${MY_SRC_URI} ) > " > >@@ -32,7 +33,10 @@ > verify-sig? ( sec-keys/openpgp-keys-rust ) > " > >-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" >+REQUIRED_USE=" >+ x86? ( cpu_flags_x86_sse2 ) >+ abi_x86_x32? ( abi_x86_64 ) >+" > > QA_PREBUILT=" > opt/${P}/bin/.* >@@ -68,7 +72,12 @@ > > default_src_unpack > >- mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die >+ # x32 is provided as a target for the amd64 install >+ if [[ "${ABI}" != x32 ]]; then >+ cp -p -R --reflink=auto "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die >+ else >+ cp -p -R --reflink=auto "${WORKDIR}/${MY_P}-x86_64-unknown-linux-gnu" "${S}" || die >+ fi > } > > patchelf_for_bin() { >@@ -94,6 +103,12 @@ > use clippy && components="${components},clippy-preview" > use rls && components="${components},rls-preview,${analysis}" > use rustfmt && components="${components},rustfmt-preview" >+ if use abi_x86_x32; then >+ einfo "Adding x32 target to x86-64 rust" >+ mv -v "${WORKDIR}/rust-std-${PV}-x86_64-unknown-linux-gnux32/rust-std-x86_64-unknown-linux-gnux32" "${S}" || die >+ echo rust-std-x86_64-unknown-linux-gnux32 >> ./components || die >+ components="${components},rust-std-x86_64-unknown-linux-gnux32" >+ fi > # Rust component 'rust-src' is extracted from separate archive > if use rust-src; then > einfo "Combining rust and rust-src installers" >@@ -188,11 +203,13 @@ > #end native abi install > > else >- local rust_target >- rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))" >- dodir "/opt/${P}/lib/rustlib" >- cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\ >- "${ED}/opt/${P}/lib/rustlib" || die >+ if [[ "${ABI}" != x32 ]]; then >+ local rust_target >+ rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))" >+ dodir "/opt/${P}/lib/rustlib" >+ cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\ >+ "${ED}/opt/${P}/lib/rustlib" || die >+ fi > fi > > # BUG: installs x86_64 binary on other arches
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 760405
:
678538
|
776612
|
776615
|
776618
|
776630
|
777059
|
777062
| 777068