Skip to content

cmake: update from 3.16.2 to 3.23.2 #2698

Merged
merged 1 commit into from
Jun 23, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions cmake.be0
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#!/usr/bin/env beesh

# BEE_VERSION cmake-3.16.2-2
# BEE_VERSION cmake-3.23.2-0

SRCURL[0]="https://cmake.org/files/v${PKGVERSION[2]}/cmake-${PKGVERSION}.tar.gz"
# SRCURL[0]="https://github.com/Kitware/CMake/releases/download/v${PKGVERSION}/cmake-${PKGVERSION}.tar.gz"
SRCURL[0]="https://beehive.molgen.mpg.de/ab3c9ed9578cdb496a252c6733989d78/cmake-3.23.2.tar.gz"

PATCHURL+=( /src/mariux/patches/cmake-3.16.2-color-off-verbose-on.patch )
PATCHURL+=( /src/mariux/patches/cmake-3.23.2-color-off-verbose-on.patch )
PATCHURL+=( /src/mariux/patches/cmake-3.16.2-dont-find-lib64.patch )
PATCHURL+=( /src/mariux/patches/cmake-3.16.2-gnu-install-dirs-lib64.patch )
PATCHURL+=( /src/mariux/patches/cmake-3.23.2-gnu-install-dirs-lib64.patch )

# build_in_sourcedir

Expand All @@ -21,11 +22,11 @@ PATCHURL+=( /src/mariux/patches/cmake-3.16.2-gnu-install-dirs-lib64.patch )
#}

mee_configure() {
${S}/configure \
${S}/bootstrap \
--prefix=/usr \
--docdir=share/doc/cmake-${PKGVERSION[2]} \
--mandir=share/man \
--qt-gui \
--parallel=$(( $(nproc) * 4 / 5 + 1 )) \
--verbose
}

Expand All @@ -36,23 +37,18 @@ mee_configure() {
mee_build_post() {

# fails:
# 5 - kwsys.testSystemTools (Failed)
# 205 - CTest.UpdateCVS (Failed)
# 210 - CTestCoverageCollectGCOV (Failed)
# 474 - RunCMake.CommandLine (Failed)
# 476 - RunCMake.install (Failed)
# 485 - RunCMake.IfacePaths_INCDIRS (Failed)
# 517 - RunCMake.CPack_TGZ (Failed)
# 594 - CMake.CheckSourceTree (Failed)

make test || true
# 80/650 Test #80: BundleUtilities ...................................***Failed 1.34 sec
# 219/650 Test #219: CTest.UpdateCVS ...................................***Failed 0.46 sec
# 224/650 Test #224: CTestCoverageCollectGCOV ..........................***Failed 0.73 sec
# 352/650 Test #352: RunCMake.CMP0* ..................................***Failed 0.22 sec
# 372/650 Test #372: RunCMake.ctest_memcheck ...........................***Failed 7.28 sec
# tons...

# make test || true
:
}

#mee_install() {
# bee_install
#}

#mee_install_post() {
# exit
#}