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 1D8F41382C5 for ; Mon, 4 Jan 2021 10:53:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54FAAE0930; Mon, 4 Jan 2021 10:53:42 +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 2DF44E0930 for ; Mon, 4 Jan 2021 10:53:42 +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 DFA13340D80 for ; Mon, 4 Jan 2021 10:53:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51B4C332 for ; Mon, 4 Jan 2021 10:53:39 +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: <1609756573.537cf3c7be556926c8d69eaf738d3bbf991be837.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: 537cf3c7be556926c8d69eaf738d3bbf991be837 X-VCS-Branch: master Date: Mon, 4 Jan 2021 10:53:39 +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: e6f0ffb1-452b-40f7-9b80-fa4cdda4f893 X-Archives-Hash: 73861ce725c4553b8b4c45eddfc2e296 commit: 537cf3c7be556926c8d69eaf738d3bbf991be837 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jan 4 10:36:13 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Jan 4 10:36:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=537cf3c7 scripts/bootstrap-prefix: add fallback for cmake bootstrap Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 0dda8055df..68a8a5c4fa 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1108,7 +1108,7 @@ bootstrap_python() { einfo "${A%.tar.*} bootstrapped" } -bootstrap_cmake() { +bootstrap_cmake_core() { PV=${1:-3.16.5} A=cmake-${PV}.tar.gz @@ -1155,6 +1155,10 @@ bootstrap_cmake() { einfo "${A%.tar.*} bootstrapped" } +bootstrap_cmake() { + bootrstrap_cmake_core 3.16.5 || bootrstrap_cmake_core 3.0.2 +} + bootstrap_zlib_core() { # use 1.2.8 by default, current bootstrap guides PV="${1:-1.2.8}"