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 4CBE41382C5 for ; Tue, 5 Jan 2021 23:01:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CE9AE07C5; Tue, 5 Jan 2021 23:01:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6123CE07C5 for ; Tue, 5 Jan 2021 23:01:45 +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 5767934110F for ; Tue, 5 Jan 2021 23:01:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9A44487 for ; Tue, 5 Jan 2021 23:01:41 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1609887697.f8ed334c4a1f2a9802f898663b3facac5ec15e01.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/tests/, eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/tests/toolchain-funcs.sh eclass/toolchain-funcs.eclass X-VCS-Directories: eclass/ eclass/tests/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: f8ed334c4a1f2a9802f898663b3facac5ec15e01 X-VCS-Branch: master Date: Tue, 5 Jan 2021 23:01:41 +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: 2adb24e4-08dd-4c9e-b270-8eec1d1e2bf0 X-Archives-Hash: c8e9f5634fb6c65f68e647b0186ec59c commit: f8ed334c4a1f2a9802f898663b3facac5ec15e01 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Jan 5 22:40:59 2021 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Jan 5 23:01:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ed334c toolchain-funcs.eclass: fix or1k* tuple detection Before the change the only recognised CHOST was 'or1k'. After the change CHOSTs like 'or1k-linux-musl' are also recognised as 'openrisc'. Reported-by: adam pimentel.space Bug: https://bugs.gentoo.org/763606 Signed-off-by: Sergei Trofimovich gentoo.org> eclass/tests/toolchain-funcs.sh | 3 ++- eclass/toolchain-funcs.eclass | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eclass/tests/toolchain-funcs.sh b/eclass/tests/toolchain-funcs.sh index a0a56fd9e5d..23ac568c4a5 100755 --- a/eclass/tests/toolchain-funcs.sh +++ b/eclass/tests/toolchain-funcs.sh @@ -27,7 +27,8 @@ test-tc-arch-kernel() { tbegin "tc-arch-kernel() (KV=2.6.30)" test-tc-arch-kernel 2.6.30 \ i{3..6}86:x86 x86_64:x86 \ - powerpc{,64}:powerpc i{3..6}86-gentoo-freebsd:i386 + powerpc{,64}:powerpc i{3..6}86-gentoo-freebsd:i386 \ + or1k:openrisc or1k-linux-musl:openrisc tend $? # diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index ec7b920bcfa..4a4bb27fc08 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -665,7 +665,7 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } mips*) echo mips;; nios2*) echo nios2;; nios*) echo nios;; - or1k|or32*) echo openrisc;; + or1k*|or32*) echo openrisc;; powerpc*) # Starting with linux-2.6.15, the 'ppc' and 'ppc64' trees # have been unified into simply 'powerpc', but until 2.6.16,