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

CMake: bump, debug, compat (#6300)

Browse Source
This commit is contained in:
extrowerk
2021-10-18 22:47:55 +02:00
committed by GitHub
parent 2b3eb2869d
commit 201b3546f9
2 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dev-util/cmake/cmake-3.20.2.recipe → dev-util/cmake/cmake-3.21.3.recipe
View File

@@ -8,20 +8,22 @@ HOMEPAGE="https://cmake.org/"
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="aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e"
SOURCE_URI="https://cmake.org/files/v3.21/cmake-$portVersion.tar.gz"
CHECKSUM_SHA256="d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f"
SOURCE_DIR="cmake-$portVersion"
PATCHES="cmake-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2 ?x86 ?arm"
SECONDARY_ARCHITECTURES="x86"
portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
PROVIDES="
cmake$secondaryArchSuffix = $portVersion compat >= 3
cmd:ccmake = $portVersion compat >= 3
cmd:cmake = $portVersion compat >= 3
cmd:cpack = $portVersion compat >= 3
cmd:ctest = $portVersion compat >= 3
cmake$secondaryArchSuffix = $portVersionCompat
cmd:ccmake = $portVersionCompat
cmd:cmake = $portVersionCompat
cmd:cpack = $portVersionCompat
cmd:ctest = $portVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -37,7 +39,7 @@ DESCRIPTION_gui="$DESCRIPTION (gui)"
PROVIDES_gui="
cmake${secondaryArchSuffix}_gui = $portVersion
cmd:cmake_gui = $portVersion compat >= 3
cmd:cmake_gui = $portVersionCompat
"
REQUIRES_gui="
haiku$secondaryArchSuffix
@@ -70,6 +72,13 @@ BUILD_PREREQUIRES="
cmd:sed
"
defineDebugInfoPackage cmake$secondaryArchSuffix \
$binDir/ccmake \
$binDir/cmake \
$binDir/cpack \
$binDir/ctest \
"$(getPackagePrefix gui)/$relativeBinDir"/cmake-gui
BUILD()
{
# not an autotools configure

42
dev-util/cmake/patches/cmake-3.20.2.patchset → dev-util/cmake/patches/cmake-3.21.3.patchset
View File

@@ -1,11 +1,11 @@
From 065f7397e802e639551a974a7576fe4fefe0861f Mon Sep 17 00:00:00 2001
From 2fd15a1c4f61ddfce3815e987004babc127c954d 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 deffdb6..bf3c845 100644
index 9a474e3..d55b856 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -20,17 +20,18 @@
@@ -44,10 +44,10 @@ index deffdb6..bf3c845 100644
#if defined(__sun)
# include <sys/link.h> // For dynamic section information
--
2.30.0
2.30.2
From ac93635fbf4e5dd95538b3420aec501d1661e015 Mon Sep 17 00:00:00 2001
From f4fa1c53a141f1a8072008987c3a3f881c531556 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,20 +67,20 @@ index 283a3eb..8fd73f2 100644
~/Library/Frameworks
/Library/Frameworks
--
2.30.0
2.30.2
From c2d6948471337514cfc5877b02ce351716dd38a3 Mon Sep 17 00:00:00 2001
From 8ae5f8b1b118b476e61a5a0d8c5477c852212a6e 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 f85d57e..bb4b99f 100755
index dc5ed0b..0fceaa8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1683,6 +1683,9 @@ else
@@ -1702,6 +1702,9 @@ else
uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700"
libs="${libs} -lsocket"
;;
@@ -91,10 +91,10 @@ index f85d57e..bb4b99f 100755
fi
if test "x${bootstrap_system_libuv}" = "x"; then
--
2.30.0
2.30.2
From 7b029f0da3fc0ec034ebc7b635587933207d7332 Mon Sep 17 00:00:00 2001
From 6ccb36fb17d036fb99bb48d2eb1259cd31ee48db 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
@@ -126,20 +126,20 @@ index e6d61ee..9d9bba9 100644
return 0;
}
--
2.30.0
2.30.2
From f4218e7fc09bac128ff841993745d8481fbd0d77 Mon Sep 17 00:00:00 2001
From a5251156fab1ba563ce893162f91a369c6d4a120 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 7e0af61..4129c00 100644
index b8e3ba6..08b11a4 100644
--- a/Modules/Platform/Haiku.cmake
+++ b/Modules/Platform/Haiku.cmake
@@ -43,6 +43,10 @@ execute_process(
@@ -38,6 +38,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}")
@@ -151,20 +151,20 @@ index 7e0af61..4129c00 100644
if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
--
2.30.0
2.30.2
From 5cdf1abdb86497ed9786713588fa742403df134f Mon Sep 17 00:00:00 2001
From 6e3ecb7124d9481037e453e973da367ad85453a8 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 4129c00..90afe19 100644
index 08b11a4..9a8ae60 100644
--- a/Modules/Platform/Haiku.cmake
+++ b/Modules/Platform/Haiku.cmake
@@ -129,6 +129,9 @@ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
@@ -124,6 +124,9 @@ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES})
@@ -175,10 +175,10 @@ index 4129c00..90afe19 100644
set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH
"Install path prefix, prepended onto install directories." FORCE)
--
2.30.0
2.30.2
From c777003f3369498099d47471753f3bbfdbfce603 Mon Sep 17 00:00:00 2001
From e1de5a3d22a7ac68b32907e77a4bea2822551a25 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
@@ -200,5 +200,5 @@ index 928e726..87d0167 100644
# Initial configuration flags.
--
2.30.0
2.30.2