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

cmake, bump to 4.1.0 (#12746)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-08-16 08:13:34 +02:00
committed by GitHub
parent c9db9a49dc
commit 24dda1fc2b
3 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-build/cmake/cmake-4.0.3.recipe → dev-build/cmake/cmake-4.1.0.recipe
View File

@@ -7,9 +7,9 @@ of your choice."
HOMEPAGE="https://cmake.org/"
COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="3"
REVISION="1"
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb"
CHECKSUM_SHA256="81ee8170028865581a8e10eaf055afb620fa4baa0beb6387241241a975033508"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"

2
dev-build/cmake/cmake_gui-4.0.3.recipe → dev-build/cmake/cmake_gui-4.1.0.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="8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb"
CHECKSUM_SHA256="81ee8170028865581a8e10eaf055afb620fa4baa0beb6387241241a975033508"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ADDITIONAL_FILES="cmake.rdef.in"

82
dev-build/cmake/patches/cmake-4.0.3.patchset → dev-build/cmake/patches/cmake-4.1.0.patchset
View File

@@ -1,14 +1,14 @@
From 5635a16b4eb16a49171888093638c35a5acb0d2c Mon Sep 17 00:00:00 2001
From d69402dffbb7cf2d8c3e38d207e518f8e39c1db0 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 eb8a0ac..fceed48 100755
index d88a88d..496256e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1799,6 +1799,9 @@ else
@@ -1792,6 +1792,9 @@ else
uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700"
libs="${libs} -lsocket"
;;
@@ -19,10 +19,10 @@ index eb8a0ac..fceed48 100755
fi
if test "x${bootstrap_system_libuv}" = "x"; then
--
2.48.1
2.50.1
From b8fed1d4d0c0a1e0e1bb40cefd291aa742e31ad2 Mon Sep 17 00:00:00 2001
From 6f81d9280a218335a16db486111a66bb3841cc87 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
@@ -54,10 +54,10 @@ index 83e8b61..314f239 100644
return 0;
}
--
2.48.1
2.50.1
From 18414ba54a51101190ce30dc4327a67a9b85b940 Mon Sep 17 00:00:00 2001
From 67f8c139c19184a32071a54a3611edf430928ef9 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
@@ -80,10 +80,10 @@ index 3610389..7ce4298 100644
if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
--
2.48.1
2.50.1
From f5e3fab109e11ededff65b8935d3befccb947a2a Mon Sep 17 00:00:00 2001
From 0679b2d0bb6f87e6646fb6420b9ca8058d747b2b 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.
@@ -104,10 +104,10 @@ index 7ce4298..0bae6a8 100644
set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH
"Install path prefix, prepended onto install directories." FORCE)
--
2.48.1
2.50.1
From 0bfa68d08bbd29bcf02ce1d3f805a8e8b8e16b05 Mon Sep 17 00:00:00 2001
From 71a262d49beed619fb68d857e3475d6361e4bd59 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
@@ -129,10 +129,10 @@ index 141838e..1c90942 100644
# Initial configuration flags.
--
2.48.1
2.50.1
From 25b1b0aecfb9788b433723aff6ab2926e2f5585a Mon Sep 17 00:00:00 2001
From faf139a0663fefd954aa2aaf796da9e92cfc264e 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/
@@ -157,10 +157,10 @@ index e82bec3..0f8a620 100644
set(CMAKE_BIN_DIR_DEFAULT "bin") # CYGWIN
set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION}") # CYGWIN
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index bae7d38..0e1df33 100644
index 6201894..c06e7ad 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -3142,7 +3142,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix)
@@ -3294,7 +3294,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix)
common.emplace_back("libx32"_s);
}
common.emplace_back("lib"_s);
@@ -173,10 +173,10 @@ index bae7d38..0e1df33 100644
auto commonGen = cmEnumPathSegmentsGenerator{ common };
auto cmakeGen = cmAppendPathSegmentGenerator{ "cmake"_s };
--
2.48.1
2.50.1
From 1edf7dd9359c2caf8d3752383263b7c716f8fd7d Mon Sep 17 00:00:00 2001
From 5d255c77e4c928ea3705251125d18ba2d5b08d6f 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.
@@ -196,20 +196,20 @@ index da20534..97bcdc2 100644
#else
# define ZSTD_HAVE_WEAK_SYMBOLS 0
--
2.48.1
2.50.1
From 1b7a01d02ff7e30fdb9a2b7262d68527713147b8 Mon Sep 17 00:00:00 2001
From 791f623520615eab0f710a7bb346623ffb7e1a7a 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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 907c344..5a5a431 100644
index cab0fcb..919c3cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,7 +137,7 @@ option(CMake_BUILD_PCH "Compile CMake with precompiled headers" OFF)
@@ -140,7 +140,7 @@ option(CMake_BUILD_PCH "Compile CMake with precompiled headers" OFF)
if(NOT CMake_TEST_EXTERNAL_CMAKE)
if(NOT DEFINED CMake_ENABLE_DEBUGGER)
# The debugger uses cppdap, which does not compile everywhere.
@@ -219,10 +219,10 @@ index 907c344..5a5a431 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 1d078ee..57bc1be 100644
index b1c8290..670fe25 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -852,6 +852,9 @@ if(CMake_ENABLE_DEBUGGER)
@@ -861,6 +861,9 @@ if(CMake_ENABLE_DEBUGGER)
)
endif()
target_link_libraries(CMakeLib PUBLIC cppdap::cppdap)
@@ -233,20 +233,20 @@ index 1d078ee..57bc1be 100644
# Check if we can build the Mach-O parser.
--
2.48.1
2.50.1
From 4e2d472b13303ebcbf7b1a9345ce6c3d8b36c045 Mon Sep 17 00:00:00 2001
From 74668bd170badb66a55d3d3d8e9382fda676b054 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
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index aca0324..3a24a7b 100644
index c65587e..35788be 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -4968,6 +4968,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
@@ -4996,6 +4996,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
this->TotalVirtualMemory = 0;
this->AvailableVirtualMemory = 0;
@@ -254,7 +254,7 @@ index aca0324..3a24a7b 100644
// Retrieve cpuid_info union for cpu 0
cpuid_info cpu_info;
get_cpuid(&cpu_info, 0, 0);
@@ -5003,6 +5004,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
@@ -5031,6 +5032,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
// Chip Extended Model
this->ChipID.ExtendedModel = cpu_info.eax_1.extended_model;
@@ -263,10 +263,10 @@ index aca0324..3a24a7b 100644
// Get ChipID.ProcessorName from other information already gathered
this->RetrieveClassicalCPUIdentity();
--
2.48.1
2.50.1
From 51b85b68676f5d17710d016c7998e5e5a67abded Mon Sep 17 00:00:00 2001
From 1e2dd7df36104edba9c332028cb030f1c575dc3e 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,10 +276,10 @@ 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 3cd77e4..6f9481d 100644
index a944164..65fb255 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -1428,6 +1428,9 @@ if ("NumPy" IN_LIST ${_PYTHON_BASE}_FIND_COMPONENTS)
@@ -1484,6 +1484,9 @@ if ("NumPy" IN_LIST ${_PYTHON_BASE}_FIND_COMPONENTS)
endif()
if ("Development" IN_LIST ${_PYTHON_BASE}_FIND_COMPONENTS)
list (APPEND ${_PYTHON_BASE}_FIND_COMPONENTS "Development.Module" "Development.Embed")
@@ -290,10 +290,10 @@ index 3cd77e4..6f9481d 100644
list (REMOVE_DUPLICATES ${_PYTHON_BASE}_FIND_COMPONENTS)
foreach (component IN ITEMS Interpreter Compiler Development Development.Module Development.SABIModule Development.Embed NumPy)
--
2.48.1
2.50.1
From 1161e5ceb9a5a5183b74966bcad4abf0162e596f Mon Sep 17 00:00:00 2001
From 576bb8f3ac51de4ce6163b4bf1d7191c196fcb13 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,10 +305,10 @@ 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 6f9481d..9dd58d0 100644
index 65fb255..e25be91 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -329,11 +329,11 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
@@ -380,11 +380,11 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
elseif (_PGPS_INCLUDE)
set (suffixes "${abi}")
if (suffixes)
@@ -324,10 +324,10 @@ index 6f9481d..9dd58d0 100644
endforeach()
endif()
--
2.48.1
2.50.1
From a87d1e8c1a0f86278b587cdacae3837e20296b8a Mon Sep 17 00:00:00 2001
From ffa863105039d2c72438ee64599985090cc31cba 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.
@@ -337,10 +337,10 @@ Those are intended for use on Linux and friends.
Fix by Begasus. Thanks!
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 318849e..8871043 100644
index 7f9e7f0..2a70689 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -327,7 +327,7 @@ install(TARGETS cmake-gui
@@ -329,7 +329,7 @@ install(TARGETS cmake-gui
RUNTIME DESTINATION bin ${COMPONENT}
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" ${COMPONENT})
@@ -350,5 +350,5 @@ index 318849e..8871043 100644
install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png"
--
2.48.1
2.50.1