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 version

Browse Source 
13/594 tests failed
This commit is contained in:
Jerome Duval
2021-01-07 20:19:35 +01:00
parent 7effdacaa4
commit 8b09f71d7a
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dev-util/cmake/cmake-3.18.4.recipe → dev-util/cmake/cmake-3.19.2.recipe
View File

@@ -7,9 +7,9 @@ of your choice."
HOMEPAGE="https://cmake.org/"
COPYRIGHT="2002-2020 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="3"
SOURCE_URI="https://cmake.org/files/v3.18/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77"
REVISION="1"
SOURCE_URI="https://cmake.org/files/v3.19/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"

40
dev-util/cmake/patches/cmake-3.18.4.patchset → dev-util/cmake/patches/cmake-3.19.2.patchset
View File

@@ -1,4 +1,4 @@
From 2d4028dd25addb772db78d2feb06dd46cb00b681 Mon Sep 17 00:00:00 2001
From ca66036f590a7d87463ff37221136e058c1f7fff Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 21 Nov 2015 22:02:38 +0000
Subject: Haiku provides elf.h now.
@@ -44,10 +44,10 @@ index a8d81f7..57bb496 100644
#if defined(__sun)
# include <sys/link.h> // For dynamic section information
--
2.28.0
2.30.0
From 2537a0d5d3a0f608e87b374386e6c800ebd674e8 Mon Sep 17 00:00:00 2001
From 9cbb816e0ce42f7c39c60cdc5ad03c46de525804 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.
@@ -67,44 +67,44 @@ index 283a3eb..8fd73f2 100644
~/Library/Frameworks
/Library/Frameworks
--
2.28.0
2.30.0
From 0c2a87666ce469081a22f0579870e35871d2d908 Mon Sep 17 00:00:00 2001
From b8e2534fc0735d3f3c63a52d8ae66ed9dcc71f78 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 04067dc..34f2639 100755
index 7ec3687..e5f42b3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1527,6 +1527,9 @@ else
uv_c_flags="${uv_c_flags} -D__EXTENSIONS__ -D_XOPEN_SOURCE=600"
libs="${libs} -lkstat -lnsl -lsendfile -lsocket -lrt"
@@ -1679,6 +1679,9 @@ else
uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700"
libs="${libs} -lsocket"
;;
+ *Haiku*)
+ libs="${libs} -lnetwork"
+ ;;
esac
fi
uv_c_flags="${uv_c_flags} `cmake_escape "-I${cmake_source_dir}/Utilities/cmlibuv/include"`"
if test "x${bootstrap_system_libuv}" = "x"; then
--
2.28.0
2.30.0
From c52012bab336206af17e1d5bc65831a0fba64e14 Mon Sep 17 00:00:00 2001
From 078d2edc656c9b70ca329b577e8792a73c3ad765 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 7b80ed5..2f8ab6c 100644
index e6d61ee..9d9bba9 100644
--- a/Utilities/cmlibuv/src/unix/core.c
+++ b/Utilities/cmlibuv/src/unix/core.c
@@ -1418,7 +1418,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
@@ -1423,7 +1423,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
return UV_EINVAL;
errno = 0;
@@ -114,7 +114,7 @@ index 7b80ed5..2f8ab6c 100644
if (r == -1 && errno != 0)
return UV__ERR(errno);
@@ -1432,8 +1434,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
@@ -1437,8 +1439,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
if (priority < UV_PRIORITY_HIGHEST || priority > UV_PRIORITY_LOW)
return UV_EINVAL;
@@ -126,10 +126,10 @@ index 7b80ed5..2f8ab6c 100644
return 0;
}
--
2.28.0
2.30.0
From 0ca0bc03e339d3bfedd93aa057cd187f7662d435 Mon Sep 17 00:00:00 2001
From 6a02cd4bc11baf3680520874da00322fe2422a02 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.
@@ -151,10 +151,10 @@ index 7e0af61..4129c00 100644
if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
--
2.28.0
2.30.0
From 0d5b6a0f198cef80ef63aacb285bbd256de08b4f Mon Sep 17 00:00:00 2001
From 630248fa05f1fb694ba80658bc2383274b8f01cc 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.
@@ -175,5 +175,5 @@ index 4129c00..90afe19 100644
set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH
"Install path prefix, prepended onto install directories." FORCE)
--
2.28.0
2.30.0