mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
cmake, bump version (#9759)
This commit is contained in:
@@ -9,8 +9,7 @@ COPYRIGHT="2002-2022 Kitware, Inc., Insight Consortium"
|
||||
LICENSE="CMake"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="0d9020f06f3ddf17fb537dc228e1a56c927ee506b486f55fe2dc19f69bf0c8db"
|
||||
SOURCE_DIR="cmake-$portVersion"
|
||||
CHECKSUM_SHA256="08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e"
|
||||
PATCHES="cmake-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2 ?x86 ?arm"
|
||||
@@ -1,4 +1,4 @@
|
||||
From 6433b2085b22087ca2552520ada31a935b08a4ef Mon Sep 17 00:00:00 2001
|
||||
From 57fdc4dc274904f7ff9627f2fb8a6720d2344f5b Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sat, 24 Mar 2018 14:19:43 +0100
|
||||
Subject: Fix search path for Lua headers.
|
||||
@@ -18,20 +18,20 @@ index 283a3eb..8fd73f2 100644
|
||||
~/Library/Frameworks
|
||||
/Library/Frameworks
|
||||
--
|
||||
2.35.1
|
||||
2.42.0
|
||||
|
||||
|
||||
From 90da36afdaa566092a81bcab7a62927e6123e3dc Mon Sep 17 00:00:00 2001
|
||||
From 4864fdf5ccbdc8928c5b119d7ce8ed38f7bf8e3c 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 e0791d5..f1bae37 100755
|
||||
index cc60425..c350fe4 100755
|
||||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -1722,6 +1722,9 @@ else
|
||||
@@ -1771,6 +1771,9 @@ else
|
||||
uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700"
|
||||
libs="${libs} -lsocket"
|
||||
;;
|
||||
@@ -42,20 +42,20 @@ index e0791d5..f1bae37 100755
|
||||
fi
|
||||
if test "x${bootstrap_system_libuv}" = "x"; then
|
||||
--
|
||||
2.35.1
|
||||
2.42.0
|
||||
|
||||
|
||||
From 72f4f0056f908483d1622bc24c07e85084bfda2b Mon Sep 17 00:00:00 2001
|
||||
From f2a38c069f502b8a683c11bba3caa82abeeca832 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
|
||||
|
||||
|
||||
diff --git a/Utilities/cmlibuv/src/unix/core.c b/Utilities/cmlibuv/src/unix/core.c
|
||||
index 0793922..2a8c88f 100644
|
||||
index d0b0e00..e7ed773 100644
|
||||
--- a/Utilities/cmlibuv/src/unix/core.c
|
||||
+++ b/Utilities/cmlibuv/src/unix/core.c
|
||||
@@ -1436,7 +1436,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
|
||||
@@ -1439,7 +1439,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
|
||||
return UV_EINVAL;
|
||||
|
||||
errno = 0;
|
||||
@@ -65,7 +65,7 @@ index 0793922..2a8c88f 100644
|
||||
|
||||
if (r == -1 && errno != 0)
|
||||
return UV__ERR(errno);
|
||||
@@ -1450,8 +1452,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
|
||||
@@ -1453,8 +1455,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
|
||||
if (priority < UV_PRIORITY_HIGHEST || priority > UV_PRIORITY_LOW)
|
||||
return UV_EINVAL;
|
||||
|
||||
@@ -77,20 +77,20 @@ index 0793922..2a8c88f 100644
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.35.1
|
||||
2.42.0
|
||||
|
||||
|
||||
From 8a009e76f6c98c390bd0ea87cbcd80b1b5c8eefd Mon Sep 17 00:00:00 2001
|
||||
From b2331642ce3f864684b5ce572a0f441507b4aef6 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 21 Sep 2019 15:30:44 +0200
|
||||
Subject: also detect secondary arch with clang.
|
||||
|
||||
|
||||
diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
|
||||
index b8e3ba6..08b11a4 100644
|
||||
index 7d9a737..e5ccf3f 100644
|
||||
--- a/Modules/Platform/Haiku.cmake
|
||||
+++ b/Modules/Platform/Haiku.cmake
|
||||
@@ -38,6 +38,10 @@ execute_process(
|
||||
@@ -35,6 +35,10 @@ execute_process(
|
||||
|
||||
string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/?(:?\n+)" _dummy "${_HAIKU_SEARCH_DIRS}\n")
|
||||
set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}")
|
||||
@@ -102,20 +102,20 @@ index b8e3ba6..08b11a4 100644
|
||||
if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
|
||||
set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
|
||||
--
|
||||
2.35.1
|
||||
2.42.0
|
||||
|
||||
|
||||
From 0e34776c1b621e1adf6a57b2223800a3372122dd Mon Sep 17 00:00:00 2001
|
||||
From 128024cca4cdcdedade21d4253e3884eca1d2428 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.
|
||||
|
||||
|
||||
diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
|
||||
index 08b11a4..9a8ae60 100644
|
||||
index e5ccf3f..c8f4b8d 100644
|
||||
--- a/Modules/Platform/Haiku.cmake
|
||||
+++ b/Modules/Platform/Haiku.cmake
|
||||
@@ -124,6 +124,9 @@ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||
@@ -121,6 +121,9 @@ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||
|
||||
LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES})
|
||||
|
||||
@@ -126,20 +126,20 @@ index 08b11a4..9a8ae60 100644
|
||||
set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH
|
||||
"Install path prefix, prepended onto install directories." FORCE)
|
||||
--
|
||||
2.35.1
|
||||
2.42.0
|
||||
|
||||
|
||||
From d1f577443fd69056812ff1685b7ed18c251334fc Mon Sep 17 00:00:00 2001
|
||||
From 746e48696ac237600637fca1de2da3e8625067e0 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
|
||||
|
||||
|
||||
diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
|
||||
index 928e726..87d0167 100644
|
||||
index d01054b..7a5271c 100644
|
||||
--- a/Modules/Compiler/GNU.cmake
|
||||
+++ b/Modules/Compiler/GNU.cmake
|
||||
@@ -48,7 +48,9 @@ macro(__compiler_gnu lang)
|
||||
@@ -49,7 +49,9 @@ macro(__compiler_gnu lang)
|
||||
# distcc does not transform -o to -MT when invoking the preprocessor
|
||||
# internally, as it ought to. Work around this bug by setting -MT here
|
||||
# even though it isn't strictly necessary.
|
||||
@@ -149,25 +149,24 @@ index 928e726..87d0167 100644
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
# Initial configuration flags.
|
||||
# define flags for linker depfile generation
|
||||
--
|
||||
2.35.1
|
||||
2.42.0
|
||||
|
||||
|
||||
From 7eeaae08e3320004c9f92e8ad51a7a39bcdd86df Mon Sep 17 00:00:00 2001
|
||||
From 7f41bba792dddf88770207af92cce5b079972e15 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/
|
||||
|
||||
|
||||
diff --git a/Source/CMakeInstallDestinations.cmake b/Source/CMakeInstallDestinations.cmake
|
||||
index e82bec3..7e5f577 100644
|
||||
index e82bec3..0f8a620 100644
|
||||
--- a/Source/CMakeInstallDestinations.cmake
|
||||
+++ b/Source/CMakeInstallDestinations.cmake
|
||||
@@ -1,11 +1,11 @@
|
||||
# Keep formatting here consistent with bootstrap script expectations.
|
||||
-if(BEOS)
|
||||
+if(BEOS OR HAIKU)
|
||||
if(BEOS)
|
||||
set(CMAKE_BIN_DIR_DEFAULT "bin") # HAIKU
|
||||
- set(CMAKE_DATA_DIR_DEFAULT "share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") # HAIKU
|
||||
+ set(CMAKE_DATA_DIR_DEFAULT "data/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") # HAIKU
|
||||
@@ -180,26 +179,26 @@ index e82bec3..7e5f577 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 f55d838..13e154f 100644
|
||||
index f863a51..0ebd876 100644
|
||||
--- a/Source/cmFindPackageCommand.cxx
|
||||
+++ b/Source/cmFindPackageCommand.cxx
|
||||
@@ -2350,7 +2350,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
|
||||
common.emplace_back("libx32");
|
||||
@@ -2680,7 +2680,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
|
||||
common.emplace_back("libx32"_s);
|
||||
}
|
||||
common.emplace_back("lib");
|
||||
common.emplace_back("lib"_s);
|
||||
+#ifdef __HAIKU__
|
||||
+ common.emplace_back("data");
|
||||
+ common.emplace_back("data"_s);
|
||||
+#else
|
||||
common.emplace_back("share");
|
||||
common.emplace_back("share"_s);
|
||||
+#endif
|
||||
|
||||
// PREFIX/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
|
||||
{
|
||||
auto cmnGen = cmEnumPathSegmentsGenerator{ common };
|
||||
auto cmakeGen = cmAppendPathSegmentGenerator{ "cmake"_s };
|
||||
--
|
||||
2.35.1
|
||||
2.42.0
|
||||
|
||||
|
||||
From 9c5b409d2b04b72271a360e4c555d2bf09749491 Mon Sep 17 00:00:00 2001
|
||||
From 649b089ef8fae1586fe5991d4d9357199160f52d 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.
|
||||
@@ -219,5 +218,5 @@ index 485cadf..95dc81b 100644
|
||||
#else
|
||||
# define ZSTD_HAVE_WEAK_SYMBOLS 0
|
||||
--
|
||||
2.35.1
|
||||
2.42.0
|
||||
|
||||
Reference in New Issue
Block a user