Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Thu, 31 Dec 2020 20:31:34
Message-Id: 1609446616.83a59486061836d3d5d4866463811eacf31a477e.grobian@gentoo
1 commit: 83a59486061836d3d5d4866463811eacf31a477e
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 31 20:30:16 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 31 20:30:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=83a59486
7
8 scripts/bootstrap-prefix: update default bootstrapped cmake a bit
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 scripts/bootstrap-prefix.sh | 7 ++++---
13 1 file changed, 4 insertions(+), 3 deletions(-)
14
15 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
16 index c383f0f11a..2de55682af 100755
17 --- a/scripts/bootstrap-prefix.sh
18 +++ b/scripts/bootstrap-prefix.sh
19 @@ -1152,7 +1152,7 @@ bootstrap_python() {
20 }
21
22 bootstrap_cmake() {
23 - PV=${1:-3.13.4}
24 + PV=${1:-3.16.5}
25 A=cmake-${PV}.tar.gz
26
27 einfo "Bootstrapping ${A%-*}"
28 @@ -1187,11 +1187,12 @@ bootstrap_cmake() {
29
30 # we need sysroot crap to build cmake itself, but it makes trouble
31 # lateron, so kill it in the installed version
32 + ver=${A%-*} ; ver=${ver%.*}
33 sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
34 - "${EROOT}"/tmp/usr/share/cmake/Modules/Platform/Apple-GNU-*.cmake || die
35 + "${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-GNU-*.cmake || die
36 # disable isysroot usage with clang as well
37 sed -i -e '/_SYSROOT_FLAG/d' \
38 - "${EROOT}"/tmp/usr/share/cmake/Modules/Platform/Apple-Clang.cmake || die
39 + "${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-Clang.cmake || die
40
41 einfo "${A%-*} bootstrapped"
42 }