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 B8464138359 for ; Sun, 22 Nov 2020 17:19:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D7F0E01B5; Sun, 22 Nov 2020 17:19:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 E78DDE01B5 for ; Sun, 22 Nov 2020 17:19:09 +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 EE87F340E72 for ; Sun, 22 Nov 2020 17:19:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12C0B435 for ; Sun, 22 Nov 2020 17:19:07 +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: <1606065493.21808d104ee069ca4d9077784b8cf0d861f63fd1.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 21808d104ee069ca4d9077784b8cf0d861f63fd1 X-VCS-Branch: master Date: Sun, 22 Nov 2020 17:19:07 +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: 91cf1cfa-f248-4c83-8d2d-0ca360ea48ba X-Archives-Hash: 6bc423457602036a5509ead8e96bb55f commit: 21808d104ee069ca4d9077784b8cf0d861f63fd1 Author: Fabian Groffen gentoo org> AuthorDate: Sun Nov 22 17:18:13 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Nov 22 17:18:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=21808d10 scripts/bootstrap-prefix: adjust/fix Darwin FSF GCC path Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index f45bf57b73..80c2b8eb8b 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -181,43 +181,39 @@ configure_toolchain() { case ${CHOST}:${DARWIN_USE_GCC} in powerpc-*darwin*|*:yes|*:1|*:true) - compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu" + einfo "Triggering Darwin with GCC toolchain path" + compiler_stage1+=" sys-apps/darwin-miscutils sys-libs/csu" local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )" - local mycc= case "${ccvers}" in *"(GCC) 4.2.1 "*) linker=sys-devel/binutils-apple - mycc=gcc ;; *"(GCC) 4.0.1 "*) linker="=sys-devel/binutils-apple-3.2" + # upgrade to 4.2.1 first compiler_stage1+=" - ${gcc_deps} - sys-devel/gcc-config sys-devel/gcc-apple sys-devel/binutils-apple" - mycc=gcc ;; *"(Gentoo "*) # probably the result of a bootstrap in progress linker=sys-devel/binutils-apple - mycc=gcc ;; - *"Apple clang version "*) + *"Apple clang version "*|*"Apple LLVM version "*) # gcc cannot build (recent) binutils-apple due to # missing blocks support, so use Xcode provided # linker/assembler linker=sys-devel/native-cctools - mycc=gcc ;; *) - eerror "unknown compiler" + eerror "unknown compiler: ${ccvers}" return 1 ;; esac - compiler="${gcc_deps} sys-devel/gcc-config sys-devel/gcc" + compiler_stage1+=" sys-devel/gcc" ;; *-darwin*) + einfo "Triggering Darwin with Clang toolchain path" # for compilers choice, see bug: # https://bugs.gentoo.org/show_bug.cgi?id=538366 compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu" @@ -1734,6 +1730,21 @@ bootstrap_stage2() { [[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \ >> "${ROOT}"/tmp/etc/portage/package.mask + # unlock GCC on Darwin for DARWIN_USE_GCC bootstraps + if [[ ${DARWIN_USE_GCC} == 1 || ${DARWIN_USE_GCC} == "yes" || \ + ${DARWIN_USE_GCC} == "true" ]] + then + { + echo "# DARWIN_USE_GCC block" + echo "sys-devel/gcc" + echo "sys-devel/native-cctools" + } >> "${ROOT}"/tmp/etc/portage/package.unmask + { + echo "# DARWIN_USE_GCC block" + echo "sys-devel/gcc ~ppc-macos" + } >> "${ROOT}"/tmp/etc/portage/package.accept_keywords + fi + # cmake has some external dependencies which require autoconf, etc. # unless we only build the buildtool, bug #603012 echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use