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 B5EA21382C5 for ; Fri, 18 Dec 2020 12:53:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A5AEE098E; Fri, 18 Dec 2020 12:53:38 +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 67394E0958 for ; Fri, 18 Dec 2020 12:53:38 +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 CFE37341085 for ; Fri, 18 Dec 2020 12:53:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B7D9D0 for ; Fri, 18 Dec 2020 12:53:35 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1608295694.47cbf56a1f5867442c9ec17db89c00bab5fefc79.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/prefix/darwin/macos/arch/arm64/profile.bashrc X-VCS-Directories: profiles/prefix/darwin/macos/arch/arm64/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 47cbf56a1f5867442c9ec17db89c00bab5fefc79 X-VCS-Branch: master Date: Fri, 18 Dec 2020 12:53:35 +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: 84d5fef2-fc3f-42c9-b2de-9ece50f40f52 X-Archives-Hash: 4568b0eb584bdbad7f8f8090eaabf065 commit: 47cbf56a1f5867442c9ec17db89c00bab5fefc79 Author: Fabian Groffen gentoo org> AuthorDate: Fri Dec 18 12:46:37 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Dec 18 12:48:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47cbf56a profiles/prefix/darwin/macos/11.0/arm64: add workaround for config.sub amd64-darwin is too new to be an established configuration, so patch in recognition for it Signed-off-by: Fabian Groffen gentoo.org> .../prefix/darwin/macos/arch/arm64/profile.bashrc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc new file mode 100644 index 00000000000..821237e6587 --- /dev/null +++ b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc @@ -0,0 +1,21 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +pre_src_configure() { + # catch when multiple pkgs are in one ebuild + cd "${WORKDIR}" + + # macOS Big Sur (11.x, darwin20) supports Apple Silicon (arm64), + # which config.sub currently doesn't understand about. It is, + # however, Apple who seem to use arm64-apple-darwin20 CHOST + # triplets, so patch that for various versions of autoconf + # This bit should be kept in sync with fix_config_sub in + # bootstrap-prefix.sh + if [[ ${CHOST} == arm64-apple-darwin* ]] ; then + # Apple Silicon doesn't use aarch64, but arm64 + find . -name "config.sub" | \ + xargs sed -i -e 's/ arm\(-\*\)* / arm\1 | arm64\1 /' + find . -name "config.sub" | \ + xargs sed -i -e 's/ aarch64 / aarch64 | arm64 /' + fi +}