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 3EA05138336 for ; Mon, 11 Mar 2019 05:00:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F461E0BF1; Mon, 11 Mar 2019 05:00:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 0E605E0BF1 for ; Mon, 11 Mar 2019 05:00:31 +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 56529335C51 for ; Mon, 11 Mar 2019 05:00:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF7E3503 for ; Mon, 11 Mar 2019 05:00:28 +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: <1552279876.6e428d13d6870832812748de67e48f170cbce6a5.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust-bin/rust-bin-1.32.0.ebuild dev-lang/rust-bin/rust-bin-1.33.0.ebuild X-VCS-Directories: dev-lang/rust-bin/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 6e428d13d6870832812748de67e48f170cbce6a5 X-VCS-Branch: master Date: Mon, 11 Mar 2019 05:00:28 +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: 3fefabd1-4fcc-4f35-9b1b-cf46b1e248be X-Archives-Hash: ec7bb91959f08d1e40518116b66171aa commit: 6e428d13d6870832812748de67e48f170cbce6a5 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Mar 11 04:46:09 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Mar 11 04:51:16 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e428d13 dev-lang/rust-bin: fix cargo on ppc64 Bug: https://bugs.gentoo.org/679806 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust-bin/rust-bin-1.32.0.ebuild | 13 ++++++++++++- dev-lang/rust-bin/rust-bin-1.33.0.ebuild | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dev-lang/rust-bin/rust-bin-1.32.0.ebuild b/dev-lang/rust-bin/rust-bin-1.32.0.ebuild index a2af32c2885..170a05bf814 100644 --- a/dev-lang/rust-bin/rust-bin-1.32.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.32.0.ebuild @@ -76,7 +76,18 @@ src_install() { dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}" local cargo=cargo-bin-${PV} - mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die + # ugly hack for https://bugs.gentoo.org/679806 + if use ppc64; then + mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}".bin || die + sed -i 's/getentropy/gEtEnTrOpY/g' "${D}/opt/${P}/bin/${cargo}".bin || die + cat <<- 'EOF' > "${D}/opt/${P}/bin/${cargo}" + #!/bin/sh + OPENSSL_ppccap=0 $(realpath $0).bin "${@}" + EOF + fperms +x "/opt/${P}/bin/${cargo}" + else + mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die + fi dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}" if use clippy; then local clippy_driver=clippy-driver-bin-${PV} diff --git a/dev-lang/rust-bin/rust-bin-1.33.0.ebuild b/dev-lang/rust-bin/rust-bin-1.33.0.ebuild index a2af32c2885..170a05bf814 100644 --- a/dev-lang/rust-bin/rust-bin-1.33.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.33.0.ebuild @@ -76,7 +76,18 @@ src_install() { dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}" local cargo=cargo-bin-${PV} - mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die + # ugly hack for https://bugs.gentoo.org/679806 + if use ppc64; then + mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}".bin || die + sed -i 's/getentropy/gEtEnTrOpY/g' "${D}/opt/${P}/bin/${cargo}".bin || die + cat <<- 'EOF' > "${D}/opt/${P}/bin/${cargo}" + #!/bin/sh + OPENSSL_ppccap=0 $(realpath $0).bin "${@}" + EOF + fperms +x "/opt/${P}/bin/${cargo}" + else + mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die + fi dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}" if use clippy; then local clippy_driver=clippy-driver-bin-${PV}