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 D44821382C5 for ; Fri, 27 Apr 2018 10:34:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4351AE0856; Fri, 27 Apr 2018 10:34:21 +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 1E708E0856 for ; Fri, 27 Apr 2018 10:34:21 +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 07D69335C72 for ; Fri, 27 Apr 2018 10:34:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B02C028F for ; Fri, 27 Apr 2018 10:34:17 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1524825151.1b9a86ae69ba55a04e287f07948d49ad74927dc1.blueness@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: dev-lang/rust/ X-VCS-Repository: proj/musl X-VCS-Files: dev-lang/rust/rust-1.21.0.ebuild dev-lang/rust/rust-1.23.0-r1.ebuild dev-lang/rust/rust-1.23.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 1b9a86ae69ba55a04e287f07948d49ad74927dc1 X-VCS-Branch: master Date: Fri, 27 Apr 2018 10:34:17 +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-Archives-Salt: c78b49f6-8d11-43c8-a15a-abf38fb587d3 X-Archives-Hash: d8c6cd409c70628d19db7e3ff100defa commit: 1b9a86ae69ba55a04e287f07948d49ad74927dc1 Author: stefson yahoo de> AuthorDate: Fri Apr 27 04:58:33 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Apr 27 10:32:31 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1b9a86ae dev-lang/rust: fix CHOST detection for arm on 17.0 profile Signed-off-by: Anthony G. Basile gentoo.org> dev-lang/rust/rust-1.21.0.ebuild | 4 ++-- dev-lang/rust/rust-1.23.0-r1.ebuild | 4 ++-- dev-lang/rust/rust-1.23.0.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-lang/rust/rust-1.21.0.ebuild b/dev-lang/rust/rust-1.21.0.ebuild index 89bfe31..3140b1d 100644 --- a/dev-lang/rust/rust-1.21.0.ebuild +++ b/dev-lang/rust/rust-1.21.0.ebuild @@ -24,7 +24,7 @@ else fi case "${CHOST}" in - armv7a-hardfloat-*) + armv7a*) RUSTARCH=armv7 ;; arm*) RUSTARCH=arm ;; @@ -35,7 +35,7 @@ case "${CHOST}" in armv7a-hardfloat-*) RUSTLIBC=${ELIBC/glibc/gnu}eabihf ;; arm*) - RUSTLIBC=${ELIBC/glibc/gnu}eabi ;; + RUSTLIBC=${CHOST##*-} ;; *) RUSTLIBC=${ELIBC/glibc/gnu} ;; esac diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild b/dev-lang/rust/rust-1.23.0-r1.ebuild index c96312b..caf1009 100644 --- a/dev-lang/rust/rust-1.23.0-r1.ebuild +++ b/dev-lang/rust/rust-1.23.0-r1.ebuild @@ -24,7 +24,7 @@ else fi case "${CHOST}" in - armv7a-hardfloat-*) + armv7*) RUSTARCH=armv7 ;; arm*) RUSTARCH=arm ;; @@ -35,7 +35,7 @@ case "${CHOST}" in armv7a-hardfloat-*) RUSTLIBC=${ELIBC/glibc/gnu}eabihf ;; arm*) - RUSTLIBC=${ELIBC/glibc/gnu}eabi ;; + RUSTLIBC=${CHOST##*-} ;; *) RUSTLIBC=${ELIBC/glibc/gnu} ;; esac diff --git a/dev-lang/rust/rust-1.23.0.ebuild b/dev-lang/rust/rust-1.23.0.ebuild index f332528..0153f9a 100644 --- a/dev-lang/rust/rust-1.23.0.ebuild +++ b/dev-lang/rust/rust-1.23.0.ebuild @@ -24,7 +24,7 @@ else fi case "${CHOST}" in - armv7a-hardfloat-*) + armv7*) RUSTARCH=armv7 ;; arm*) RUSTARCH=arm ;; @@ -35,7 +35,7 @@ case "${CHOST}" in armv7a-hardfloat-*) RUSTLIBC=${ELIBC/glibc/gnu}eabihf ;; arm*) - RUSTLIBC=${ELIBC/glibc/gnu}eabi ;; + RUSTLIBC=${CHOST##*-} ;; *) RUSTLIBC=${ELIBC/glibc/gnu} ;; esac