haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmake, bump to 4.1.2 (#13065)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-10-17 14:19:13 +02:00
committed by GitHub
parent a63ad52ca5
commit a3522adfe8
3 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
dev-build/cmake/cmake-4.1.1.recipe → dev-build/cmake/cmake-4.1.2.recipe
View File

@@ -9,7 +9,7 @@ COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="1"
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="b29f6f19733aa224b7763507a108a427ed48c688e1faf22b29c44e1c30549282"
CHECKSUM_SHA256="643f04182b7ba323ab31f526f785134fb79cba3188a852206ef0473fee282a15"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -118,34 +118,36 @@ INSTALL()
# x86_32 (for a build with cmake-gui). Took around 140 minutes.
# 72% tests passed, 189 tests failed out of 676
#
# version 4.0.3: x86_64.
# 96% tests passed, 25 tests failed out of 644
# version 4.1.2 (without cmake-gui): x86_64.
# 96% tests passed, 26 tests failed out of 626
# The following tests FAILED:
# 6 - kwsys.testSystemTools (Failed)
# 26 - FindPackageCMakeTest (Failed)
# 27 - FindPackageCpsTest (Failed)
# 59 - ExportImport (Failed) CUDA
# 68 - StagingPrefix (Failed)
# 82 - Module.ExternalData (Failed)
# 142 - InstallMode-COPY (Failed)
# 143 - InstallMode-REL_SYMLINK (Failed)
# 144 - InstallMode-REL_SYMLINK_OR_COPY (Failed)
# 145 - InstallMode-ABS_SYMLINK (Failed)
# 146 - InstallMode-ABS_SYMLINK_OR_COPY (Failed)
# 147 - InstallMode-SYMLINK (Failed)
# 148 - InstallMode-SYMLINK_OR_COPY (Failed)
# 246 - CTestTestTimeout (Failed)
# 430 - RunCMake.ParseImplicitLinkInfo (Failed)
# 439 - RunCMake.find_dependency (Failed)
# 486 - RunCMake.file (Failed)
# 493 - RunCMake.find_library (Failed)
# 494 - RunCMake.find_package (Failed)
# 533 - RunCMake.no_install_prefix (Failed)
# 535 - RunCMake.CTestTimeout (Failed)
# 541 - RunCMake.FindPkgConfig (Failed)
# 563 - RunCMake.target_sources (Failed)
# 569 - RunCMake.CommandLine (Failed)
# 571 - RunCMake.install (Failed) ISPC
# 5 - kwsys.testSystemTools (Failed)
# 24 - FindPackageCMakeTest (Failed)
# 25 - FindPackageCpsTest (Failed)
# 57 - ExportImport (Failed) CUDA
# 66 - StagingPrefix (Failed)
# 80 - Module.ExternalData (Failed)
# 140 - InstallMode-COPY (Failed)
# 141 - InstallMode-REL_SYMLINK (Failed)
# 142 - InstallMode-REL_SYMLINK_OR_COPY (Failed)
# 143 - InstallMode-ABS_SYMLINK (Failed)
# 144 - InstallMode-ABS_SYMLINK_OR_COPY (Failed)
# 145 - InstallMode-SYMLINK (Failed)
# 146 - InstallMode-SYMLINK_OR_COPY (Failed)
# 221 - CTestTestTimeout (Failed)
# 408 - RunCMake.ParseImplicitLinkInfo (Failed)
# 419 - RunCMake.find_dependency (Failed)
# 467 - RunCMake.file (Failed)
# 469 - RunCMake.file-DOWNLOAD (Failed)
# 474 - RunCMake.find_library (Failed)
# 475 - RunCMake.find_package (Failed)
# 514 - RunCMake.no_install_prefix (Failed)
# 516 - RunCMake.CTestTimeout (Failed)
# 522 - RunCMake.FindPkgConfig (Failed)
# 544 - RunCMake.target_sources (Failed)
# 550 - RunCMake.CommandLine (Failed)
# 552 - RunCMake.install (Failed) ISPC
TEST()
{
# 2 tests crash (1 test case has 5 crashes, but passes the test?), exclude with -E

2
dev-build/cmake/cmake_gui-4.1.1.recipe → dev-build/cmake/cmake_gui-4.1.2.recipe
View File

@@ -12,7 +12,7 @@ COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="1"
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="b29f6f19733aa224b7763507a108a427ed48c688e1faf22b29c44e1c30549282"
CHECKSUM_SHA256="643f04182b7ba323ab31f526f785134fb79cba3188a852206ef0473fee282a15"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ADDITIONAL_FILES="cmake.rdef.in"

36
dev-build/cmake/patches/cmake-4.1.1.patchset → dev-build/cmake/patches/cmake-4.1.2.patchset
View File

@@ -1,14 +1,14 @@
From 41b3228105b72790a6cce6daa97bea46b9ab2238 Mon Sep 17 00:00:00 2001
From 89659d928138673eeb45eaa447f95ebfbe6f92d2 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 7 Sep 2019 17:29:56 +0200
Subject: links against libnetwork
diff --git a/bootstrap b/bootstrap
index d88a88d..496256e 100755
index aea87b9..60eddf3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1792,6 +1792,9 @@ else
@@ -1793,6 +1793,9 @@ else
uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700"
libs="${libs} -lsocket"
;;
@@ -22,7 +22,7 @@ index d88a88d..496256e 100755
2.50.1
From 3ba8a33e3b80d265bcba008deca7bf961b38f70e Mon Sep 17 00:00:00 2001
From 480ede1567b2b0c06f861188ceab169bb41ce19a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 7 Sep 2019 23:46:47 +0200
Subject: bootstrap uses cmlibuv
@@ -57,7 +57,7 @@ index 83e8b61..314f239 100644
2.50.1
From 913a09f885e21f23cce8a75709887a3bc0031f47 Mon Sep 17 00:00:00 2001
From 2ee54601513f203a0276d1d0a7fcc0389e389218 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 21 Sep 2019 15:30:44 +0200
Subject: Haiku: Improve secondary arch detection
@@ -83,7 +83,7 @@ index 3610389..7ce4298 100644
2.50.1
From f264dc88b7ec4ed8a165d6c4864b2e81e8801d1a Mon Sep 17 00:00:00 2001
From c92aedc70b7c1c32306cc3f4a2fe5e1db319580c Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Fri, 21 Feb 2020 15:38:39 -0500
Subject: Modules/Haiku: Set CMAKE_SYSTEM_FRAMEWORK_PATH.
@@ -107,7 +107,7 @@ index 7ce4298..0bae6a8 100644
2.50.1
From 266b61868ccac1bdfe0e116b2061c5f6e4bd67c1 Mon Sep 17 00:00:00 2001
From 7383f54f173104ca9452bc49d28ba0e5a0e5769d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 15 Apr 2021 21:09:12 +0200
Subject: disable dependency tracking for older GNU compilers
@@ -132,7 +132,7 @@ index 141838e..1c90942 100644
2.50.1
From 7733091b53a4d2aaefc87c2e6903e8a49e1aaa38 Mon Sep 17 00:00:00 2001
From b987eab1a006e6f1267034005d1afb6ab3ddfc90 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 20 Oct 2021 14:28:22 +0200
Subject: Haiku: fix install dirs, let FindPackage search in data/
@@ -176,7 +176,7 @@ index 6201894..c06e7ad 100644
2.50.1
From 28ce7f42bd6c9436a297655d9d11f59004b8fbec Mon Sep 17 00:00:00 2001
From 5176569d5adc808cc5458912d01eb65c07991f85 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 23 Feb 2022 13:44:06 +0100
Subject: Disable weak symbols; they do not seem to behave correctly.
@@ -199,7 +199,7 @@ index da20534..97bcdc2 100644
2.50.1
From 38d8185128e77f8c1f7c36591b1f24af1ce35363 Mon Sep 17 00:00:00 2001
From 312db9aee513165f61cdc8209e1ce13ae9a11165 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 9 Feb 2024 13:48:22 +0100
Subject: Haiku: enable debugger
@@ -219,10 +219,10 @@ index cab0fcb..919c3cc 100644
AND NOT (CMAKE_CXX_COMPILER_ID STREQUAL "XLClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.1)
AND NOT (CMAKE_CXX_COMPILER_ID STREQUAL "LCC" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 1.23)
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b1c8290..670fe25 100644
index c54da44..df99db8 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -861,6 +861,9 @@ if(CMake_ENABLE_DEBUGGER)
@@ -863,6 +863,9 @@ if(CMake_ENABLE_DEBUGGER)
)
endif()
target_link_libraries(CMakeLib PUBLIC cppdap::cppdap)
@@ -236,7 +236,7 @@ index b1c8290..670fe25 100644
2.50.1
From a73bfbeb3cacf0db608044655b84b9de8873baf3 Mon Sep 17 00:00:00 2001
From 025c541c7b8c514a644a73d32db49b14d4b30fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Sat, 31 Aug 2024 21:52:20 +0200
Subject: Fix build for non-x86 arches
@@ -266,7 +266,7 @@ index c65587e..35788be 100644
2.50.1
From 5bb4b0ee2ebf93a9dd6b41ce7842be4ae9c9fc15 Mon Sep 17 00:00:00 2001
From 183e3fe57b1813337fa827bc3feebf01bc7ba69e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 25 Sep 2024 09:11:06 +0200
Subject: FindPython: when component Development is searched, also search
@@ -276,7 +276,7 @@ FindPython only uses the python config when an interpreter is found.
The python config contains the right include paths on x86 for instance.
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index a944164..65fb255 100644
index 50c8452..dd72bf2 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -1484,6 +1484,9 @@ if ("NumPy" IN_LIST ${_PYTHON_BASE}_FIND_COMPONENTS)
@@ -293,7 +293,7 @@ index a944164..65fb255 100644
2.50.1
From 3644076a83263568f103e8bc5e09a6c51a1f0bcf Mon Sep 17 00:00:00 2001
From fc04da2e64f2ab8c1d0a64f0f3063c16e8498392 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Mon, 23 Sep 2024 05:40:41 -0300
Subject: Use 'headers' instead of 'include' as fallback.
@@ -305,7 +305,7 @@ Not strictly needed after korli's previous fix, but... doesn't hurts.
Kudos to madmax for this early workaround!
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 65fb255..e25be91 100644
index dd72bf2..d7fa1f9 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -380,11 +380,11 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
@@ -327,7 +327,7 @@ index 65fb255..e25be91 100644
2.50.1
From bb914dc18fa30f6604fa1af36ee09218ffa29532 Mon Sep 17 00:00:00 2001
From b478d4bc7f8cb3a88cd2500918571887c021cddd Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Thu, 26 Sep 2024 15:16:36 -0300
Subject: Avoid installing icons, .desktop, and mime files.