commit: 83a59486061836d3d5d4866463811eacf31a477e Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Dec 31 20:30:16 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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" }