mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-18 17:35:59 +01:00
cmake, bump to 4.1.5 and 3.31.11 (#13742)
move cmake_gui to seperate directory, fixes conflicting work directory
This commit is contained in:
@@ -5,11 +5,11 @@ simple platform and compiler independent configuration files. CMake generates \
|
||||
native makefiles and workspaces that can be used in the compiler environment \
|
||||
of your choice."
|
||||
HOMEPAGE="https://cmake.org/"
|
||||
COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
|
||||
COPYRIGHT="2002-2026 Kitware, Inc., Insight Consortium"
|
||||
LICENSE="CMake"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="a728a8ae5846aecbe3f4fea1405d809a6455ac7d1ed1f80c1fcf82f48d071ee1"
|
||||
CHECKSUM_SHA256="50ce77215cf266630fa5de97c360f4c313bb79f94b35236b63c1216de3196356"
|
||||
PATCHES="cmake-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -5,11 +5,11 @@ simple platform and compiler independent configuration files. CMake generates \
|
||||
native makefiles and workspaces that can be used in the compiler environment \
|
||||
of your choice."
|
||||
HOMEPAGE="https://cmake.org/"
|
||||
COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
|
||||
COPYRIGHT="2002-2026 Kitware, Inc., Insight Consortium"
|
||||
LICENSE="CMake"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="cf06fadfd6d41fa8e1ade5099e54976d1d844fd1487ab99942341f91b13d3e29"
|
||||
CHECKSUM_SHA256="c0a3b3f2912b2166f522d5010ffb6029d8454ee635f5ad7a3247e0be7f9a15c9"
|
||||
SOURCE_DIR="cmake-$portVersion"
|
||||
PATCHES="cmake-$portVersion.patchset"
|
||||
|
||||
@@ -1,135 +0,0 @@
|
||||
SUMMARY="A cross-platform build system (GUI version)"
|
||||
DESCRIPTION="CMake is a family of tools designed to build, test and package \
|
||||
software. It is used to control the software compilation process using \
|
||||
simple platform and compiler independent configuration files. CMake generates \
|
||||
native makefiles and workspaces that can be used in the compiler environment \
|
||||
of your choice.
|
||||
|
||||
This package provides the GUI version of CMake (cmake-gui). It must be \
|
||||
installed in the same prefix as the main cmake package."
|
||||
HOMEPAGE="https://cmake.org/"
|
||||
COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
|
||||
LICENSE="CMake"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="cf06fadfd6d41fa8e1ade5099e54976d1d844fd1487ab99942341f91b13d3e29"
|
||||
SOURCE_DIR="cmake-$portVersion"
|
||||
PATCHES="cmake-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="cmake.rdef.in"
|
||||
|
||||
ARCHITECTURES="?all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="?x86"
|
||||
|
||||
portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
cmake3_gui$secondaryArchSuffix = $portVersion
|
||||
cmd:cmake_gui = $portVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
cmake3$secondaryArchSuffix
|
||||
lib:libarchive$secondaryArchSuffix
|
||||
lib:libcppdap$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libexpat$secondaryArchSuffix
|
||||
lib:libGL$secondaryArchSuffix
|
||||
lib:libjsoncpp$secondaryArchSuffix
|
||||
lib:libQt6Core$secondaryArchSuffix
|
||||
lib:libQt6Gui$secondaryArchSuffix
|
||||
lib:libQt6Widgets$secondaryArchSuffix
|
||||
lib:librhash$secondaryArchSuffix
|
||||
lib:libstdc++$secondaryArchSuffix
|
||||
lib:libuv$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
# Earlier versions of the gui package came from just one recipe named "cmake".
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
REPLACES="cmake${secondaryArchSuffix}_gui"
|
||||
fi
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libarchive$secondaryArchSuffix
|
||||
devel:libcppdap$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libncurses$secondaryArchSuffix
|
||||
devel:libexpat$secondaryArchSuffix
|
||||
devel:libjsoncpp$secondaryArchSuffix >= 25
|
||||
devel:libQt6Core$secondaryArchSuffix
|
||||
devel:libQt6Gui$secondaryArchSuffix
|
||||
devel:libQt6Widgets$secondaryArchSuffix
|
||||
devel:librhash$secondaryArchSuffix
|
||||
devel:libuv$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
devel:nlohmann_json
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmake$secondaryArchSuffix == $portVersion
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:grep
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
defineDebugInfoPackage cmake3_gui$secondaryArchSuffix \
|
||||
$prefix/bin/cmake-gui
|
||||
|
||||
BUILD()
|
||||
{
|
||||
# the CMAKE_*_DIR variables should match the definitions in the cmake recipe
|
||||
cmake -Bbuild-gui -S. $cmakeDirArgs \
|
||||
-DCMAKE_INSTALL_BINDIR=bin \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DBUILD_CursesDialog=OFF \
|
||||
-DBUILD_QtDialog=ON \
|
||||
-DCMAKE_DATA_DIR=/$relativeDataDir/cmake \
|
||||
-DCMAKE_DOC_DIR=/$relativeDocumentationDir/packages/cmake \
|
||||
-DCMAKE_MAN_DIR=/$relativeManDir \
|
||||
-DCMAKE_XDGDATA_DIR=/$relativeDataDir \
|
||||
-DCMAKE_USE_SYSTEM_BZIP2=ON \
|
||||
-DCMAKE_USE_SYSTEM_CPPDAP=ON \
|
||||
-DCMAKE_USE_SYSTEM_CURL=ON \
|
||||
-DCMAKE_USE_SYSTEM_EXPAT=ON \
|
||||
-DCMAKE_USE_SYSTEM_FORM=ON \
|
||||
-DCMAKE_USE_SYSTEM_JSONCPP=ON \
|
||||
-DCMAKE_USE_SYSTEM_LIBARCHIVE=ON \
|
||||
-DCMAKE_USE_SYSTEM_LIBLZMA=ON \
|
||||
-DCMAKE_USE_SYSTEM_LIBRHASH=ON \
|
||||
-DCMAKE_USE_SYSTEM_LIBUV=ON \
|
||||
-DCMAKE_USE_SYSTEM_NGHTTP2=ON \
|
||||
-DCMAKE_USE_SYSTEM_ZLIB=ON \
|
||||
-DCMAKE_USE_SYSTEM_ZSTD=ON
|
||||
|
||||
make -Cbuild-gui/Source/QtDialog $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
# make install tries to use a local cmake, which isn't built, use the system version instead
|
||||
ln -sf /boot/system/bin/cmake build-gui/bin
|
||||
|
||||
make -Cbuild-gui/Source/QtDialog install
|
||||
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
local MINOR="`echo "$portVersion" | cut -d. -f3`"
|
||||
local APP_NAME="CMake-GUI"
|
||||
local LONG_INFO="$SUMMARY"
|
||||
local APP_SIGNATURE="application/x-vnd.cmake-gui"
|
||||
|
||||
sed \
|
||||
-e "s|@MAJOR@|$MAJOR|" \
|
||||
-e "s|@MIDDLE@|$MIDDLE|" \
|
||||
-e "s|@MINOR@|$MINOR|" \
|
||||
-e "s|@LONG_INFO@|$LONG_INFO|" \
|
||||
-e "s|@APP_NAME@|$APP_NAME|" \
|
||||
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
|
||||
$portDir/additional-files/cmake.rdef.in > cmake.rdef
|
||||
|
||||
addResourcesToBinaries cmake.rdef $prefix/bin/cmake-gui
|
||||
addAppDeskbarSymlink $prefix/bin/cmake-gui CMake-GUI
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
From 896984ac0e48b1ef6aaa99ebe709159de0461cd2 Mon Sep 17 00:00:00 2001
|
||||
From dcb07322537b4cca977d33999c12f62c1c579d85 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.
|
||||
|
||||
|
||||
diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
|
||||
index 2249ab1..b010f9a 100644
|
||||
index 2249ab1..187332b 100644
|
||||
--- a/Modules/FindLua51.cmake
|
||||
+++ b/Modules/FindLua51.cmake
|
||||
@@ -32,7 +32,7 @@ cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_<n>
|
||||
@@ -13,15 +13,15 @@ index 2249ab1..b010f9a 100644
|
||||
HINTS
|
||||
ENV LUA_DIR
|
||||
- PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include
|
||||
+ PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include lua5.1
|
||||
+ PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include lua51
|
||||
PATHS
|
||||
~/Library/Frameworks
|
||||
/Library/Frameworks
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From 53df0ab3ae6e0452ccffe903229227d00a8880c9 Mon Sep 17 00:00:00 2001
|
||||
From 6de51bcb19c39ec865a0b2935caeccbf874e8596 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
|
||||
@@ -42,10 +42,10 @@ index 53358d5..95e1631 100755
|
||||
fi
|
||||
if test "x${bootstrap_system_libuv}" = "x"; then
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From edbe9c67c3c9a9df96fe9aefbd8cbf8033889d0c Mon Sep 17 00:00:00 2001
|
||||
From b3d9bd50ce74d0d169f38b31fa1f9e780765d318 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
|
||||
@@ -77,10 +77,10 @@ index 83e8b61..314f239 100644
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From f56b12d30b173e0b5e6cbc2d082681ede488a572 Mon Sep 17 00:00:00 2001
|
||||
From b6d52156d2f2d610f4edf266106c139ecf188292 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 21 Sep 2019 15:30:44 +0200
|
||||
Subject: Haiku: Improve secondary arch detection
|
||||
@@ -103,10 +103,10 @@ index 7d9a737..74b17f5 100644
|
||||
if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
|
||||
set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From 41d9dc27850b199d4ba9e004e46c0bfd4c009118 Mon Sep 17 00:00:00 2001
|
||||
From 6311dc622f637ac26eae7914abbc53d742ac3c7e 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.
|
||||
@@ -127,17 +127,17 @@ index 74b17f5..41d77bb 100644
|
||||
set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH
|
||||
"Install path prefix, prepended onto install directories." FORCE)
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From 6e2b9d9887dfff82726ddd87a87623e128db78c2 Mon Sep 17 00:00:00 2001
|
||||
From a81a30817b8881bbbeaa6101537ac6f08010528a 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 83c818d..668ed54 100644
|
||||
index 793261e..4151555 100644
|
||||
--- a/Modules/Compiler/GNU.cmake
|
||||
+++ b/Modules/Compiler/GNU.cmake
|
||||
@@ -49,7 +49,9 @@ macro(__compiler_gnu lang)
|
||||
@@ -152,10 +152,10 @@ index 83c818d..668ed54 100644
|
||||
|
||||
# Initial configuration flags.
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From 9910fc23d478fdb9aa5371302557adfad6deee44 Mon Sep 17 00:00:00 2001
|
||||
From 45fe0277802df7a692d84b38c21415b58f7cb6b9 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/
|
||||
@@ -196,10 +196,10 @@ index cc150fd..07a7c24 100644
|
||||
auto cmnGen = cmEnumPathSegmentsGenerator{ common };
|
||||
auto cmakeGen = cmAppendPathSegmentGenerator{ "cmake"_s };
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From ccdcc868d50cafcd296dc590b4820b3f8eb57e2b Mon Sep 17 00:00:00 2001
|
||||
From 5043268d239d3fc70635db5cf81af6ebb5d98e84 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,10 +219,10 @@ index da20534..97bcdc2 100644
|
||||
#else
|
||||
# define ZSTD_HAVE_WEAK_SYMBOLS 0
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From f3ba72d01431c5a6e5474c3373782a3194501e30 Mon Sep 17 00:00:00 2001
|
||||
From 1d101a6c406fe22e3bb934d5744f6f4c10658b1d Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 9 Feb 2024 13:48:22 +0100
|
||||
Subject: Haiku: enable debugger
|
||||
@@ -256,20 +256,20 @@ index c4cd101..00f3209 100644
|
||||
|
||||
# Check if we can build the Mach-O parser.
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From 2d34136f2a19c93be7b05ff50b54792948fbb48a Mon Sep 17 00:00:00 2001
|
||||
From 285af2db61efd7e644fb5630321e60ab2950da08 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
|
||||
Date: Sat, 31 Aug 2024 21:52:20 +0200
|
||||
Subject: Fix build for non-x86 arches
|
||||
|
||||
|
||||
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
|
||||
index 933d649..666f543 100644
|
||||
index c79058e..4642e91 100644
|
||||
--- a/Source/kwsys/SystemInformation.cxx
|
||||
+++ b/Source/kwsys/SystemInformation.cxx
|
||||
@@ -4957,6 +4957,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
|
||||
@@ -4963,6 +4963,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
|
||||
this->TotalVirtualMemory = 0;
|
||||
this->AvailableVirtualMemory = 0;
|
||||
|
||||
@@ -277,7 +277,7 @@ index 933d649..666f543 100644
|
||||
// Retrieve cpuid_info union for cpu 0
|
||||
cpuid_info cpu_info;
|
||||
get_cpuid(&cpu_info, 0, 0);
|
||||
@@ -4992,6 +4993,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
|
||||
@@ -4998,6 +4999,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
|
||||
|
||||
// Chip Extended Model
|
||||
this->ChipID.ExtendedModel = cpu_info.eax_1.extended_model;
|
||||
@@ -286,10 +286,10 @@ index 933d649..666f543 100644
|
||||
// Get ChipID.ProcessorName from other information already gathered
|
||||
this->RetrieveClassicalCPUIdentity();
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From 79a7bb3ec990cfcc5cb76fdc18db63c179787bf1 Mon Sep 17 00:00:00 2001
|
||||
From 8daf6f2785fcec1a4313c3d0f10a8b4797094b84 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 25 Sep 2024 09:11:06 +0200
|
||||
Subject: FindPython: when component Development is searched, also search
|
||||
@@ -299,10 +299,10 @@ 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 c741ec1..30b638f 100644
|
||||
index c1f25ca..4e36660 100644
|
||||
--- a/Modules/FindPython/Support.cmake
|
||||
+++ b/Modules/FindPython/Support.cmake
|
||||
@@ -1434,6 +1434,9 @@ if ("NumPy" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
|
||||
@@ -1432,6 +1432,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")
|
||||
@@ -313,10 +313,10 @@ index c741ec1..30b638f 100644
|
||||
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
|
||||
2.52.0
|
||||
|
||||
|
||||
From e6d256b3b28ab8b31904c9d688ce6595b07997b5 Mon Sep 17 00:00:00 2001
|
||||
From aabffc8b09c5c93cf357ae3c99a27f05385d9c29 Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Mon, 23 Sep 2024 05:40:41 -0300
|
||||
Subject: Use 'headers' instead of 'include' as fallback.
|
||||
@@ -328,7 +328,7 @@ Not strictly needed after korli's previous fix, but... doesn't hurts.
|
||||
Kudos to madmax for this early workaround!
|
||||
|
||||
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
|
||||
index 30b638f..61780d7 100644
|
||||
index 4e36660..c1e8f09 100644
|
||||
--- a/Modules/FindPython/Support.cmake
|
||||
+++ b/Modules/FindPython/Support.cmake
|
||||
@@ -334,11 +334,11 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
|
||||
@@ -347,10 +347,10 @@ index 30b638f..61780d7 100644
|
||||
endforeach()
|
||||
endif()
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
|
||||
From d9263b179508e3dec5e056b8f618157b842c629f Mon Sep 17 00:00:00 2001
|
||||
From bd563d3f9f4f0fdc32de49a0450626d6d721453b Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Thu, 26 Sep 2024 15:16:36 -0300
|
||||
Subject: Avoid installing icons, .desktop, and mime files.
|
||||
@@ -373,109 +373,5 @@ index e4b53fd..3938f3e 100644
|
||||
install(
|
||||
FILES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png"
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
From b3979d2fa09129e1e4bdc18d7d108df075b980c5 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Mon, 10 Feb 2025 14:59:31 +0100
|
||||
Subject: Build fixes (Linker configuration)
|
||||
|
||||
Related:https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9992
|
||||
|
||||
diff --git a/Modules/Platform/Linker/Haiku-ASM.cmake b/Modules/Platform/Linker/Haiku-ASM.cmake
|
||||
new file mode 100644
|
||||
index 0000000..9e8a2b3
|
||||
--- /dev/null
|
||||
+++ b/Modules/Platform/Linker/Haiku-ASM.cmake
|
||||
@@ -0,0 +1,5 @@
|
||||
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
+# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
+
|
||||
+# GNU is the default linker
|
||||
+include(Platform/Linker/Haiku-GNU-ASM)
|
||||
diff --git a/Modules/Platform/Linker/Haiku-C.cmake b/Modules/Platform/Linker/Haiku-C.cmake
|
||||
new file mode 100644
|
||||
index 0000000..4abf4a7
|
||||
--- /dev/null
|
||||
+++ b/Modules/Platform/Linker/Haiku-C.cmake
|
||||
@@ -0,0 +1,5 @@
|
||||
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
+# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
+
|
||||
+# GNU is the default linker
|
||||
+include(Platform/Linker/Haiku-GNU-C)
|
||||
diff --git a/Modules/Platform/Linker/Haiku-CXX.cmake b/Modules/Platform/Linker/Haiku-CXX.cmake
|
||||
new file mode 100644
|
||||
index 0000000..96fd0f8
|
||||
--- /dev/null
|
||||
+++ b/Modules/Platform/Linker/Haiku-CXX.cmake
|
||||
@@ -0,0 +1,5 @@
|
||||
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
+# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
+
|
||||
+# GNU is the default linker
|
||||
+include(Platform/Linker/Haiku-GNU-CXX)
|
||||
diff --git a/Modules/Platform/Linker/Haiku-GNU-ASM.cmake b/Modules/Platform/Linker/Haiku-GNU-ASM.cmake
|
||||
new file mode 100644
|
||||
index 0000000..bfef8b9
|
||||
--- /dev/null
|
||||
+++ b/Modules/Platform/Linker/Haiku-GNU-ASM.cmake
|
||||
@@ -0,0 +1,4 @@
|
||||
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
+# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
+
|
||||
+include(Platform/Linker/Linux-GNU-ASM)
|
||||
diff --git a/Modules/Platform/Linker/Haiku-GNU-C.cmake b/Modules/Platform/Linker/Haiku-GNU-C.cmake
|
||||
new file mode 100644
|
||||
index 0000000..2d0efda
|
||||
--- /dev/null
|
||||
+++ b/Modules/Platform/Linker/Haiku-GNU-C.cmake
|
||||
@@ -0,0 +1,4 @@
|
||||
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
+# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
+
|
||||
+include(Platform/Linker/Linux-GNU-C)
|
||||
diff --git a/Modules/Platform/Linker/Haiku-GNU-CXX.cmake b/Modules/Platform/Linker/Haiku-GNU-CXX.cmake
|
||||
new file mode 100644
|
||||
index 0000000..33c46d5
|
||||
--- /dev/null
|
||||
+++ b/Modules/Platform/Linker/Haiku-GNU-CXX.cmake
|
||||
@@ -0,0 +1,4 @@
|
||||
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
+# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
+
|
||||
+include(Platform/Linker/Linux-GNU-CXX)
|
||||
diff --git a/Modules/Platform/Linker/Haiku-LLD-ASM.cmake b/Modules/Platform/Linker/Haiku-LLD-ASM.cmake
|
||||
new file mode 100644
|
||||
index 0000000..870e59e
|
||||
--- /dev/null
|
||||
+++ b/Modules/Platform/Linker/Haiku-LLD-ASM.cmake
|
||||
@@ -0,0 +1,4 @@
|
||||
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
+# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
+
|
||||
+include(Platform/Linker/Linux-LLD-ASM)
|
||||
diff --git a/Modules/Platform/Linker/Haiku-LLD-C.cmake b/Modules/Platform/Linker/Haiku-LLD-C.cmake
|
||||
new file mode 100644
|
||||
index 0000000..efeeb16
|
||||
--- /dev/null
|
||||
+++ b/Modules/Platform/Linker/Haiku-LLD-C.cmake
|
||||
@@ -0,0 +1,4 @@
|
||||
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
+# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
+
|
||||
+include(Platform/Linker/Linux-LLD-C)
|
||||
diff --git a/Modules/Platform/Linker/Haiku-LLD-CXX.cmake b/Modules/Platform/Linker/Haiku-LLD-CXX.cmake
|
||||
new file mode 100644
|
||||
index 0000000..46a516c
|
||||
--- /dev/null
|
||||
+++ b/Modules/Platform/Linker/Haiku-LLD-CXX.cmake
|
||||
@@ -0,0 +1,4 @@
|
||||
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
+# file Copyright.txt or https://cmake.org/licensing for details.
|
||||
+
|
||||
+include(Platform/Linker/Linux-LLD-CXX)
|
||||
--
|
||||
2.45.2
|
||||
2.52.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 89659d928138673eeb45eaa447f95ebfbe6f92d2 Mon Sep 17 00:00:00 2001
|
||||
From f19c1c73b6723969e727fbaf8fc71ff673d5fe7b 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
|
||||
@@ -19,10 +19,10 @@ index aea87b9..60eddf3 100755
|
||||
fi
|
||||
if test "x${bootstrap_system_libuv}" = "x"; then
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From 480ede1567b2b0c06f861188ceab169bb41ce19a Mon Sep 17 00:00:00 2001
|
||||
From 116b868e7c19306fad316963a394cd3da10e1aea 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
|
||||
@@ -54,10 +54,10 @@ index 83e8b61..314f239 100644
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From 2ee54601513f203a0276d1d0a7fcc0389e389218 Mon Sep 17 00:00:00 2001
|
||||
From ce069212be30318640c17f996e71c27f442118ee Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 21 Sep 2019 15:30:44 +0200
|
||||
Subject: Haiku: Improve secondary arch detection
|
||||
@@ -80,10 +80,10 @@ index 3610389..7ce4298 100644
|
||||
if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
|
||||
set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From c92aedc70b7c1c32306cc3f4a2fe5e1db319580c Mon Sep 17 00:00:00 2001
|
||||
From 7fe08f3af5c810f7ec7e83f59c1978536d1ef62c 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.
|
||||
@@ -104,10 +104,10 @@ index 7ce4298..0bae6a8 100644
|
||||
set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH
|
||||
"Install path prefix, prepended onto install directories." FORCE)
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From 7383f54f173104ca9452bc49d28ba0e5a0e5769d Mon Sep 17 00:00:00 2001
|
||||
From bb920569a0c1fd882d273a241c81dc25e538fcf9 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
|
||||
@@ -129,10 +129,10 @@ index 141838e..1c90942 100644
|
||||
|
||||
# Initial configuration flags.
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From b987eab1a006e6f1267034005d1afb6ab3ddfc90 Mon Sep 17 00:00:00 2001
|
||||
From 33005aefaa579900573b9e790ff143f7977d0a68 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/
|
||||
@@ -157,10 +157,10 @@ index e82bec3..0f8a620 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 6201894..c06e7ad 100644
|
||||
index 23083b0..6cc8a1a 100644
|
||||
--- a/Source/cmFindPackageCommand.cxx
|
||||
+++ b/Source/cmFindPackageCommand.cxx
|
||||
@@ -3294,7 +3294,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix)
|
||||
@@ -3293,7 +3293,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix)
|
||||
common.emplace_back("libx32"_s);
|
||||
}
|
||||
common.emplace_back("lib"_s);
|
||||
@@ -173,10 +173,10 @@ index 6201894..c06e7ad 100644
|
||||
auto commonGen = cmEnumPathSegmentsGenerator{ common };
|
||||
auto cmakeGen = cmAppendPathSegmentGenerator{ "cmake"_s };
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From 5176569d5adc808cc5458912d01eb65c07991f85 Mon Sep 17 00:00:00 2001
|
||||
From 1a9a410354a04638cd66e0882b89b068b3859b7c 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.
|
||||
@@ -196,20 +196,20 @@ index da20534..97bcdc2 100644
|
||||
#else
|
||||
# define ZSTD_HAVE_WEAK_SYMBOLS 0
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From 312db9aee513165f61cdc8209e1ce13ae9a11165 Mon Sep 17 00:00:00 2001
|
||||
From 32cea27259a21ea481a39960e06bf4a872014398 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 9 Feb 2024 13:48:22 +0100
|
||||
Subject: Haiku: enable debugger
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cab0fcb..919c3cc 100644
|
||||
index ef6e301..0bca3cc 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -140,7 +140,7 @@ option(CMake_BUILD_PCH "Compile CMake with precompiled headers" OFF)
|
||||
@@ -215,7 +215,7 @@ option(CMake_BUILD_PCH "Compile CMake with precompiled headers" OFF)
|
||||
if(NOT CMake_TEST_EXTERNAL_CMAKE)
|
||||
if(NOT DEFINED CMake_ENABLE_DEBUGGER)
|
||||
# The debugger uses cppdap, which does not compile everywhere.
|
||||
@@ -233,10 +233,10 @@ index c54da44..df99db8 100644
|
||||
|
||||
# Check if we can build the Mach-O parser.
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From 025c541c7b8c514a644a73d32db49b14d4b30fab Mon Sep 17 00:00:00 2001
|
||||
From b8684ef70b4e596063e97376e37e228c44ab1aaa Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
|
||||
Date: Sat, 31 Aug 2024 21:52:20 +0200
|
||||
Subject: Fix build for non-x86 arches
|
||||
@@ -263,10 +263,10 @@ index c65587e..35788be 100644
|
||||
// Get ChipID.ProcessorName from other information already gathered
|
||||
this->RetrieveClassicalCPUIdentity();
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From 183e3fe57b1813337fa827bc3feebf01bc7ba69e Mon Sep 17 00:00:00 2001
|
||||
From 387886e01f4cf886354e59845c8c79b1e0166033 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 25 Sep 2024 09:11:06 +0200
|
||||
Subject: FindPython: when component Development is searched, also search
|
||||
@@ -276,7 +276,7 @@ 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 50c8452..dd72bf2 100644
|
||||
index 24a3970..b1b2006 100644
|
||||
--- a/Modules/FindPython/Support.cmake
|
||||
+++ b/Modules/FindPython/Support.cmake
|
||||
@@ -1484,6 +1484,9 @@ if ("NumPy" IN_LIST ${_PYTHON_BASE}_FIND_COMPONENTS)
|
||||
@@ -290,10 +290,10 @@ index 50c8452..dd72bf2 100644
|
||||
list (REMOVE_DUPLICATES ${_PYTHON_BASE}_FIND_COMPONENTS)
|
||||
foreach (component IN ITEMS Interpreter Compiler Development Development.Module Development.SABIModule Development.Embed NumPy)
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From fc04da2e64f2ab8c1d0a64f0f3063c16e8498392 Mon Sep 17 00:00:00 2001
|
||||
From f9b015b843ba680d75cf1347951885d5963cbbf6 Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Mon, 23 Sep 2024 05:40:41 -0300
|
||||
Subject: Use 'headers' instead of 'include' as fallback.
|
||||
@@ -305,7 +305,7 @@ Not strictly needed after korli's previous fix, but... doesn't hurts.
|
||||
Kudos to madmax for this early workaround!
|
||||
|
||||
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
|
||||
index dd72bf2..d7fa1f9 100644
|
||||
index b1b2006..33d8256 100644
|
||||
--- a/Modules/FindPython/Support.cmake
|
||||
+++ b/Modules/FindPython/Support.cmake
|
||||
@@ -380,11 +380,11 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
|
||||
@@ -324,10 +324,10 @@ index dd72bf2..d7fa1f9 100644
|
||||
endforeach()
|
||||
endif()
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From b478d4bc7f8cb3a88cd2500918571887c021cddd Mon Sep 17 00:00:00 2001
|
||||
From 6601a77d5dbe0b17c8ccd8fbdd66411acce8e2f3 Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Thu, 26 Sep 2024 15:16:36 -0300
|
||||
Subject: Avoid installing icons, .desktop, and mime files.
|
||||
@@ -350,5 +350,5 @@ index 7f9e7f0..2a70689 100644
|
||||
install(
|
||||
FILES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png"
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
@@ -8,11 +8,11 @@ of your choice.
|
||||
This package provides the GUI version of CMake (cmake-gui). It must be \
|
||||
installed in the same prefix as the main cmake package."
|
||||
HOMEPAGE="https://cmake.org/"
|
||||
COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium"
|
||||
COPYRIGHT="2002-2026 Kitware, Inc., Insight Consortium"
|
||||
LICENSE="CMake"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="a728a8ae5846aecbe3f4fea1405d809a6455ac7d1ed1f80c1fcf82f48d071ee1"
|
||||
CHECKSUM_SHA256="50ce77215cf266630fa5de97c360f4c313bb79f94b35236b63c1216de3196356"
|
||||
SOURCE_DIR="cmake-$portVersion"
|
||||
PATCHES="cmake-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="cmake.rdef.in"
|
||||
1
dev-build/cmake_gui/licenses
Symbolic link
1
dev-build/cmake_gui/licenses
Symbolic link
@@ -0,0 +1 @@
|
||||
../cmake/licenses
|
||||
1
dev-build/cmake_gui/patches
Symbolic link
1
dev-build/cmake_gui/patches
Symbolic link
@@ -0,0 +1 @@
|
||||
../cmake/patches
|
||||
Reference in New Issue
Block a user