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 75D131382C5 for ; Thu, 31 Dec 2020 20:31:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A356EE091A; Thu, 31 Dec 2020 20:31:33 +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 89AC8E091A for ; Thu, 31 Dec 2020 20:31:33 +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 5E29F340E53 for ; Thu, 31 Dec 2020 20:31:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D7387CC for ; Thu, 31 Dec 2020 20:31:30 +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: <1609446616.83a59486061836d3d5d4866463811eacf31a477e.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: 83a59486061836d3d5d4866463811eacf31a477e X-VCS-Branch: master Date: Thu, 31 Dec 2020 20:31:30 +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: 03ee3f65-aded-49c4-8269-12c0f527e1ca X-Archives-Hash: a501fe0b9dd002b16d54cef9a7771d98 commit: 83a59486061836d3d5d4866463811eacf31a477e Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 31 20:30:16 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 31 20:30:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=83a59486 scripts/bootstrap-prefix: update default bootstrapped cmake a bit Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index c383f0f11a..2de55682af 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1152,7 +1152,7 @@ bootstrap_python() { } bootstrap_cmake() { - PV=${1:-3.13.4} + PV=${1:-3.16.5} A=cmake-${PV}.tar.gz einfo "Bootstrapping ${A%-*}" @@ -1187,11 +1187,12 @@ bootstrap_cmake() { # we need sysroot crap to build cmake itself, but it makes trouble # lateron, so kill it in the installed version + ver=${A%-*} ; ver=${ver%.*} sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ - "${EROOT}"/tmp/usr/share/cmake/Modules/Platform/Apple-GNU-*.cmake || die + "${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-GNU-*.cmake || die # disable isysroot usage with clang as well sed -i -e '/_SYSROOT_FLAG/d' \ - "${EROOT}"/tmp/usr/share/cmake/Modules/Platform/Apple-Clang.cmake || die + "${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-Clang.cmake || die einfo "${A%-*} bootstrapped" }