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

cmake: bump version

Browse Source 
fix build with gcc 2.95
This commit is contained in:
Jerome Duval
2021-04-15 21:10:17 +02:00
parent 7ebf467046
commit 90b32c1cc4
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-util/cmake/cmake-3.20.0.recipe → dev-util/cmake/cmake-3.20.1.recipe
View File

@@ -9,7 +9,7 @@ COPYRIGHT="2002-2021 Kitware, Inc., Insight Consortium"
LICENSE="CMake"
REVISION="1"
SOURCE_URI="https://cmake.org/files/v3.20/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755"
CHECKSUM_SHA256="3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"

43
dev-util/cmake/patches/cmake-3.20.0.patchset → dev-util/cmake/patches/cmake-3.20.1.patchset
View File

@@ -1,11 +1,11 @@
From ca66036f590a7d87463ff37221136e058c1f7fff Mon Sep 17 00:00:00 2001
From 065f7397e802e639551a974a7576fe4fefe0861f 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.
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index a8d81f7..57bb496 100644
index deffdb6..bf3c845 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -20,17 +20,18 @@
@@ -47,7 +47,7 @@ index a8d81f7..57bb496 100644
2.30.0
From 9cbb816e0ce42f7c39c60cdc5ad03c46de525804 Mon Sep 17 00:00:00 2001
From ac93635fbf4e5dd95538b3420aec501d1661e015 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.
@@ -70,17 +70,17 @@ index 283a3eb..8fd73f2 100644
2.30.0
From b8e2534fc0735d3f3c63a52d8ae66ed9dcc71f78 Mon Sep 17 00:00:00 2001
From c2d6948471337514cfc5877b02ce351716dd38a3 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 7ec3687..e5f42b3 100755
index f85d57e..bb4b99f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1679,6 +1679,9 @@ else
@@ -1683,6 +1683,9 @@ else
uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700"
libs="${libs} -lsocket"
;;
@@ -94,7 +94,7 @@ index 7ec3687..e5f42b3 100755
2.30.0
From 078d2edc656c9b70ca329b577e8792a73c3ad765 Mon Sep 17 00:00:00 2001
From 7b029f0da3fc0ec034ebc7b635587933207d7332 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
@@ -129,7 +129,7 @@ index e6d61ee..9d9bba9 100644
2.30.0
From 6a02cd4bc11baf3680520874da00322fe2422a02 Mon Sep 17 00:00:00 2001
From f4218e7fc09bac128ff841993745d8481fbd0d77 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.
@@ -154,7 +154,7 @@ index 7e0af61..4129c00 100644
2.30.0
From 630248fa05f1fb694ba80658bc2383274b8f01cc Mon Sep 17 00:00:00 2001
From 5cdf1abdb86497ed9786713588fa742403df134f 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.
@@ -177,3 +177,28 @@ index 4129c00..90afe19 100644
--
2.30.0
From c777003f3369498099d47471753f3bbfdbfce603 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
--- a/Modules/Compiler/GNU.cmake
+++ b/Modules/Compiler/GNU.cmake
@@ -48,7 +48,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.
- set(CMAKE_DEPFILE_FLAGS_${lang} "-MD -MT <DEP_TARGET> -MF <DEP_FILE>")
+ if(NOT CMAKE_${lang}_COMPILER_ID STREQUAL "GNU" OR NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4.0)
+ set(CMAKE_DEPFILE_FLAGS_${lang} "-MD -MT <DEP_TARGET> -MF <DEP_FILE>")
+ endif()
endif()
# Initial configuration flags.
--
2.30.0