From 327126e40e2e4359407dad0979d7e4575b23cf63 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 25 Sep 2024 09:28:40 +0200 Subject: [PATCH] cmake: fix FindPython to search Interpreter when Development is required this is for x86 fix #11155 --- dev-build/cmake/cmake-3.28.3.recipe | 2 +- dev-build/cmake/patches/cmake-3.28.3.patchset | 47 +++++++++++++++---- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/dev-build/cmake/cmake-3.28.3.recipe b/dev-build/cmake/cmake-3.28.3.recipe index 0622f60e9..3d606f7e7 100644 --- a/dev-build/cmake/cmake-3.28.3.recipe +++ b/dev-build/cmake/cmake-3.28.3.recipe @@ -7,7 +7,7 @@ of your choice." HOMEPAGE="https://cmake.org/" COPYRIGHT="2002-2023 Kitware, Inc., Insight Consortium" LICENSE="CMake" -REVISION="2" +REVISION="3" SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz" CHECKSUM_SHA256="72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1" PATCHES="cmake-$portVersion.patchset" diff --git a/dev-build/cmake/patches/cmake-3.28.3.patchset b/dev-build/cmake/patches/cmake-3.28.3.patchset index 78f9f6b08..02cbcaf80 100644 --- a/dev-build/cmake/patches/cmake-3.28.3.patchset +++ b/dev-build/cmake/patches/cmake-3.28.3.patchset @@ -1,4 +1,4 @@ -From 33ea1830a803f66c59f38589805e43656faca0e7 Mon Sep 17 00:00:00 2001 +From bdfde315f01be082c799d55a51a32000a6df0609 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 24 Mar 2018 14:19:43 +0100 Subject: Fix search path for Lua headers. @@ -21,7 +21,7 @@ index 405a7a7..f7fa477 100644 2.45.2 -From 32a31d4fa17df1ccb37779ceeb6d8fddcccfd503 Mon Sep 17 00:00:00 2001 +From f91921cf37dab9a34b3de3ffaf8f967ffd5ac874 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 7 Sep 2019 17:29:56 +0200 Subject: links against libnetwork @@ -45,7 +45,7 @@ index 115c354..84a9759 100755 2.45.2 -From 680263a7958afb47452a72170386bdb136e7772f Mon Sep 17 00:00:00 2001 +From e019bb0a453aeb7bb326131043e043335331fe88 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 7 Sep 2019 23:46:47 +0200 Subject: bootstrap uses cmlibuv @@ -80,7 +80,7 @@ index d0b0e00..e7ed773 100644 2.45.2 -From 4cbd1a41b7a2f3c65ac37c3e8b629f39d6142165 Mon Sep 17 00:00:00 2001 +From 7b45c570b03574443bb0c6ed5e210322212ab039 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 21 Sep 2019 15:30:44 +0200 Subject: Haiku: Improve secondary arch detection @@ -106,7 +106,7 @@ index 7d9a737..74b17f5 100644 2.45.2 -From 8e6bbdda1cc04596408fc7f570db19a5ba68f9ed Mon Sep 17 00:00:00 2001 +From 8203e383c4cdfab1756010f4fa80cbad748cafe8 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 21 Feb 2020 15:38:39 -0500 Subject: Modules/Haiku: Set CMAKE_SYSTEM_FRAMEWORK_PATH. @@ -130,7 +130,7 @@ index 74b17f5..41d77bb 100644 2.45.2 -From 8595fba610744bca2548d931f8c514f488b54f70 Mon Sep 17 00:00:00 2001 +From bc8fa4b88742e2fbd96ba691b74de72e63724cb2 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 15 Apr 2021 21:09:12 +0200 Subject: disable dependency tracking for older GNU compilers @@ -155,7 +155,7 @@ index d01054b..7a5271c 100644 2.45.2 -From d8e0aafe7a6a1781a5aa6cf389eaf2d451160a81 Mon Sep 17 00:00:00 2001 +From ecbbf02731e0a441ffa4f292b4022893020e177e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 20 Oct 2021 14:28:22 +0200 Subject: Haiku: fix install dirs, let FindPackage search in data/ @@ -199,7 +199,7 @@ index 30458cd..68fecef 100644 2.45.2 -From 037d60c2bfb59e6c1f81d4d2867cbb7940b10ba1 Mon Sep 17 00:00:00 2001 +From feff435b069d58d6db492085dd62415d64d3f558 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 23 Feb 2022 13:44:06 +0100 Subject: Disable weak symbols; they do not seem to behave correctly. @@ -222,7 +222,7 @@ index 485cadf..95dc81b 100644 2.45.2 -From 0eb4e7b228a05f80d0490af279d073fa9b73c081 Mon Sep 17 00:00:00 2001 +From 0510c47fb9f80029fece57683e78eb48b2e61d97 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 9 Feb 2024 13:48:22 +0100 Subject: Haiku: enable debugger @@ -259,7 +259,7 @@ index 1bc855e..93378da 100644 2.45.2 -From da893309fde0ec42448f3105387b123bcb194c14 Mon Sep 17 00:00:00 2001 +From b09dd23084bbcb906a9e6d9dfbcde7e7c3de8722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= Date: Sat, 31 Aug 2024 21:52:20 +0200 Subject: Fix build for non-x86 arches @@ -288,3 +288,30 @@ index 369ff9a..84d5d65 100644 -- 2.45.2 + +From fb94f94843cfa04242f1f43bb4e0a2d9e185ca93 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 25 Sep 2024 09:11:06 +0200 +Subject: FindPython: when component Development is searched, also search + Interpreter + +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 08ab9c0..89e49ec 100644 +--- a/Modules/FindPython/Support.cmake ++++ b/Modules/FindPython/Support.cmake +@@ -1360,6 +1360,9 @@ if ("NumPy" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS) + endif() + if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS) + list (APPEND ${_PYTHON_PREFIX}_FIND_COMPONENTS "Development.Module" "Development.Embed") ++ if (HAIKU) ++ list (APPEND ${_PYTHON_PREFIX}_FIND_COMPONENTS "Interpreter") ++ endif() + endif() + list (REMOVE_DUPLICATES ${_PYTHON_PREFIX}_FIND_COMPONENTS) + foreach (_${_PYTHON_PREFIX}_COMPONENT IN ITEMS Interpreter Compiler Development Development.Module Development.SABIModule Development.Embed NumPy) +-- +2.45.2 +