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 DC24B138334 for ; Thu, 6 Jun 2019 05:57:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8DB0E089B; Thu, 6 Jun 2019 05:57:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 BCE9CE089B for ; Thu, 6 Jun 2019 05:57:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 674643457DA for ; Thu, 6 Jun 2019 05:57:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82520566 for ; Thu, 6 Jun 2019 05:57:13 +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: <1559800599.e96cc4c5501c00acacf5f66e40d08c73af02d552.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: e96cc4c5501c00acacf5f66e40d08c73af02d552 X-VCS-Branch: master Date: Thu, 6 Jun 2019 05:57:13 +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: 34ee99ba-25c3-480d-980c-3c937c78c339 X-Archives-Hash: fba67b62791e179f5422c8a7892d63b0 commit: e96cc4c5501c00acacf5f66e40d08c73af02d552 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jun 6 05:53:37 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jun 6 05:56:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96cc4c5 dev-lang/rust: handle libdir workaround on arm as well Bug: https://bugs.gentoo.org/672816 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/rust-1.34.2.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-lang/rust/rust-1.34.2.ebuild b/dev-lang/rust/rust-1.34.2.ebuild index c0d1a001cbc..8973490b5aa 100644 --- a/dev-lang/rust/rust-1.34.2.ebuild +++ b/dev-lang/rust/rust-1.34.2.ebuild @@ -267,12 +267,14 @@ src_install() { done # temp fix for https://bugs.gentoo.org/672816 - if use x86; then + # FIXME: this should handle libdir=lib, not exact arches + if { use x86 || use arm; }; 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 + einfo "fixing bug #672816" mv "${wrongdir}" "${rightdir}" || die rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die fi