From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F01E2138334 for ; Mon, 27 May 2019 00:13:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9C0AE085B; Mon, 27 May 2019 00:13:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8811E0858 for ; Mon, 27 May 2019 00:13:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5DEE634510E for ; Mon, 27 May 2019 00:13:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9D6E566 for ; Mon, 27 May 2019 00:13:12 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1558915978.3474de23b4bd438ea766e82a4c37f7ebc97c7392.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/rust-1.34.2.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 3474de23b4bd438ea766e82a4c37f7ebc97c7392 X-VCS-Branch: master Date: Mon, 27 May 2019 00:13:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bda7d475-f7ff-4e43-9842-a3d1c88d0c15 X-Archives-Hash: a6d2612c9d69c352985f77903986359c commit: 3474de23b4bd438ea766e82a4c37f7ebc97c7392 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon May 27 00:06:35 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon May 27 00:12:58 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3474de23 dev-lang/rust: fix codegen-backends location on x86 comitting to stable without revbump so I don't force all other users to rebuild this beast Bug: https://bugs.gentoo.org/672816 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/rust-1.34.2.ebuild | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dev-lang/rust/rust-1.34.2.ebuild b/dev-lang/rust/rust-1.34.2.ebuild index 6a8ae98793b..c0d1a001cbc 100644 --- a/dev-lang/rust/rust-1.34.2.ebuild +++ b/dev-lang/rust/rust-1.34.2.ebuild @@ -266,6 +266,18 @@ src_install() { "${ED}/usr/${abi_libdir}" || die done + # temp fix for https://bugs.gentoo.org/672816 + if use x86; then + local rust_target wrongdir rightdir + rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) + wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends" + rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends" + if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then + mv "${wrongdir}" "${rightdir}" || die + rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die + fi + fi # end temp fix + dodoc COPYRIGHT # FIXME: