mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
cmake: bump version
This commit is contained in:
@@ -1,323 +0,0 @@
|
||||
SUMMARY="A cross-platform build system"
|
||||
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."
|
||||
HOMEPAGE="https://cmake.org/"
|
||||
COPYRIGHT="2002-2024 Kitware, Inc., Insight Consortium"
|
||||
LICENSE="CMake"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="9f55e1a40508f2f29b7e065fa08c29f82c402fa0402da839fffe64a25755a86d"
|
||||
PATCHES="cmake-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
cmake$secondaryArchSuffix = $portVersionCompat
|
||||
cmd:ccmake = $portVersionCompat
|
||||
cmd:cmake = $portVersionCompat
|
||||
cmd:cpack = $portVersionCompat
|
||||
cmd:ctest = $portVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libarchive$secondaryArchSuffix
|
||||
# lib:libcppdap$secondaryArchSuffix # use the embedded copy to avoid circular deps.
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libexpat$secondaryArchSuffix
|
||||
lib:libjsoncpp$secondaryArchSuffix
|
||||
lib:libform$secondaryArchSuffix # from ncurses.
|
||||
lib:libncurses$secondaryArchSuffix
|
||||
lib:librhash$secondaryArchSuffix
|
||||
lib:libstdc++$secondaryArchSuffix
|
||||
lib:libuv$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
# Theres are never linked to the resulting "cmds:"s. See note on BUILD_REQUIRES.
|
||||
# lib:libbz2$secondaryArchSuffix
|
||||
# lib:liblzma$secondaryArchSuffix
|
||||
# lib:libnghttp2$secondaryArchSuffix
|
||||
# lib:libzstd$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libarchive$secondaryArchSuffix
|
||||
# devel:libcppdap$secondaryArchSuffix # use the embedded copy to avoid circular deps.
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libexpat$secondaryArchSuffix
|
||||
devel:libjsoncpp$secondaryArchSuffix >= 25
|
||||
devel:libncurses$secondaryArchSuffix
|
||||
devel:librhash$secondaryArchSuffix
|
||||
devel:libuv$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
devel:nlohmann_json
|
||||
# The following do not appear to be used, nor with --system-libs, nor by enabling them
|
||||
# individually. Leaving them here just because they are mentioned in ./configure --help
|
||||
# and during the build process' output.
|
||||
# devel:libbz2$secondaryArchSuffix
|
||||
# devel:liblzma$secondaryArchSuffix
|
||||
# devel:libnghttp2$secondaryArchSuffix
|
||||
# devel:libzstd$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:grep
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:sed
|
||||
cmd:which
|
||||
"
|
||||
|
||||
defineDebugInfoPackage cmake$secondaryArchSuffix \
|
||||
$prefix/bin/ccmake \
|
||||
$prefix/bin/cmake \
|
||||
$prefix/bin/cpack \
|
||||
$prefix/bin/ctest
|
||||
|
||||
|
||||
BUILD()
|
||||
{
|
||||
export LDFLAGS="-lbsd"
|
||||
|
||||
# not an autotools configure
|
||||
# --system-libs doesn't allow --no-system-* overrides
|
||||
./configure --prefix=$prefix \
|
||||
--datadir=/$relativeDataDir/cmake \
|
||||
--docdir=/$relativeDocDir \
|
||||
--mandir=/$relativeManDir \
|
||||
--xdgdatadir=/$relativeDataDir \
|
||||
--no-system-libs \
|
||||
--system-curl \
|
||||
--system-expat \
|
||||
--system-jsoncpp \
|
||||
--system-libarchive \
|
||||
--system-librhash \
|
||||
--system-libuv \
|
||||
--system-zlib \
|
||||
--bootstrap-system-libuv \
|
||||
--bootstrap-system-jsoncpp \
|
||||
--bootstrap-system-librhash \
|
||||
--parallel=${jobArgs#-j}
|
||||
# These do not seem to be used anyway (libarchive at least links to libz/libzstd):
|
||||
# --system-bzip2 --system-liblzma --system-zstd, --system-nghttp2
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
}
|
||||
|
||||
|
||||
# For reference: version 3.30.3
|
||||
# x86_32 (for a build with cmake-gui). Took around 140 minutes.
|
||||
# 72% tests passed, 189 tests failed out of 676
|
||||
#
|
||||
# version 3.30.5: x86_64.
|
||||
# 70% tests passed, 190 tests failed out of 627
|
||||
# The following tests FAILED:
|
||||
# 6 - kwsys.testSystemTools (Failed)
|
||||
# 26 - FindPackageTest (Failed)
|
||||
# 58 - ExportImport (Failed)
|
||||
# 67 - StagingPrefix (Failed)
|
||||
# 82 - Module.ExternalData (Failed)
|
||||
# 143 - InstallMode-COPY (Failed)
|
||||
# 144 - InstallMode-REL_SYMLINK (Failed)
|
||||
# 145 - InstallMode-REL_SYMLINK_OR_COPY (Failed)
|
||||
# 146 - InstallMode-ABS_SYMLINK (Failed)
|
||||
# 147 - InstallMode-ABS_SYMLINK_OR_COPY (Failed)
|
||||
# 148 - InstallMode-SYMLINK (Failed)
|
||||
# 149 - InstallMode-SYMLINK_OR_COPY (Failed)
|
||||
# 204 - CTestCoverageCollectGCOV (Failed)
|
||||
# 247 - CTestTestTimeout (Failed)
|
||||
# 280 - CMakeLib.testUVProcessChain (Failed)
|
||||
# 319 - RunCMake.CMP0019 (Failed)
|
||||
# 320 - RunCMake.CMP0022 (Failed)
|
||||
# 321 - RunCMake.CMP0026 (Failed)
|
||||
# 323 - RunCMake.CMP0037 (Failed)
|
||||
# 324 - RunCMake.CMP0038 (Failed)
|
||||
# 325 - RunCMake.CMP0039 (Failed)
|
||||
# 326 - RunCMake.CMP0040 (Failed)
|
||||
# 327 - RunCMake.CMP0041 (Failed)
|
||||
# 328 - RunCMake.CMP0043 (Failed)
|
||||
# 329 - RunCMake.CMP0045 (Failed)
|
||||
# 330 - RunCMake.CMP0046 (Failed)
|
||||
# 331 - RunCMake.CMP0049 (Failed)
|
||||
# 332 - RunCMake.CMP0050 (Failed)
|
||||
# 333 - RunCMake.CMP0051 (Failed)
|
||||
# 334 - RunCMake.CMP0053 (Failed)
|
||||
# 335 - RunCMake.CMP0054 (Failed)
|
||||
# 336 - RunCMake.CMP0055 (Failed)
|
||||
# 337 - RunCMake.CMP0057 (Failed)
|
||||
# 338 - RunCMake.CMP0059 (Failed)
|
||||
# 339 - RunCMake.CMP0060 (Failed)
|
||||
# 340 - RunCMake.CMP0064 (Failed)
|
||||
# 341 - RunCMake.CMP0069 (Failed)
|
||||
# 342 - RunCMake.CMP0081 (Failed)
|
||||
# 343 - RunCMake.CMP0102 (Failed)
|
||||
# 344 - RunCMake.CMP0106 (Failed)
|
||||
# 345 - RunCMake.CMP0111 (Failed)
|
||||
# 346 - RunCMake.CMP0115 (Failed)
|
||||
# 347 - RunCMake.CMP0118 (Failed)
|
||||
# 348 - RunCMake.CMP0119 (Failed)
|
||||
# 349 - RunCMake.CMP0121 (Failed)
|
||||
# 350 - RunCMake.CMP0126 (Failed)
|
||||
# 352 - RunCMake.CMP0135 (Failed)
|
||||
# 353 - RunCMake.CMP0139 (Failed)
|
||||
# 354 - RunCMake.CMP0152 (Failed)
|
||||
# 355 - RunCMake.CMP0153 (Failed)
|
||||
# 356 - RunCMake.CMP0156 (Failed)
|
||||
# 357 - RunCMake.CMP0160 (Failed)
|
||||
# 358 - RunCMake.CMP0163 (Failed)
|
||||
# 361 - RunCMake.CMP0170 (Failed)
|
||||
# 362 - RunCMake.CMP0065 (Failed)
|
||||
# 363 - RunCMake.Make (Failed)
|
||||
# 364 - RunCMake.CTest (Failed)
|
||||
# 366 - RunCMake.ABI (Failed)
|
||||
# 368 - RunCMake.AutogenNoQt (Failed)
|
||||
# 369 - RunCMake.BuildDepends (Failed)
|
||||
# 372 - RunCMake.CMakeDependentOption (Failed)
|
||||
# 376 - RunCMake.CompilerChange (Failed)
|
||||
# 377 - RunCMake.CompilerNotFound (Failed)
|
||||
# 379 - RunCMake.Configure (Failed)
|
||||
# 380 - RunCMake.DisallowedCommands (Failed)
|
||||
# 384 - RunCMake.ExternalData (Failed)
|
||||
# 386 - RunCMake.FPHSA (Failed)
|
||||
# 387 - RunCMake.FileAPI (Failed)
|
||||
# 388 - RunCMake.FindBoost (Failed)
|
||||
# 390 - RunCMake.FindOpenGL (Failed)
|
||||
# 395 - RunCMake.GenEx-LINK_LANGUAGE (Failed)
|
||||
# 396 - RunCMake.GenEx-LINK_LANG_AND_ID (Failed)
|
||||
# 399 - RunCMake.GenEx-LINK_LIBRARY (Failed)
|
||||
# 400 - RunCMake.GenEx-LINK_GROUP (Failed)
|
||||
# 401 - RunCMake.GenEx-TARGET_FILE (Failed)
|
||||
# 403 - RunCMake.GenEx-GENEX_EVAL (Failed)
|
||||
# 404 - RunCMake.GenEx-TARGET_PROPERTY (Failed)
|
||||
# 407 - RunCMake.GenEx-PATH_EQUAL (Failed)
|
||||
# 409 - RunCMake.GeneratorExpression (Failed)
|
||||
# 411 - RunCMake.GeneratorInstance (Failed)
|
||||
# 412 - RunCMake.GeneratorPlatform (Failed)
|
||||
# 413 - RunCMake.GeneratorToolset (Failed)
|
||||
# 414 - RunCMake.GetPrerequisites (Failed)
|
||||
# 415 - RunCMake.GNUInstallDirs (Failed)
|
||||
# 418 - RunCMake.Languages (Failed)
|
||||
# 420 - RunCMake.LinkItemValidation (Failed)
|
||||
# 422 - RunCMake.ObjectLibrary (Failed)
|
||||
# 425 - RunCMake.RuntimePath (Failed)
|
||||
# 429 - RunCMake.TargetObjects (Failed)
|
||||
# 430 - RunCMake.TargetProperties (Failed)
|
||||
# 431 - RunCMake.ToolchainFile (Failed)
|
||||
# 432 - RunCMake.find_dependency (Failed)
|
||||
# 433 - RunCMake.CompileDefinitions (Failed)
|
||||
# 435 - RunCMake.CompileFeatures (Failed)
|
||||
# 437 - RunCMake.PolicyScope (Failed)
|
||||
# 439 - RunCMake.WriteCompilerDetectionHeader (Failed)
|
||||
# 442 - RunCMake.VisibilityPreset (Failed)
|
||||
# 443 - RunCMake.CompatibleInterface (Failed)
|
||||
# 444 - RunCMake.Syntax (Failed)
|
||||
# 446 - RunCMake.MaxRecursionDepth (Failed)
|
||||
# 447 - RunCMake.add_custom_command (Failed)
|
||||
# 448 - RunCMake.add_custom_target (Failed)
|
||||
# 450 - RunCMake.add_executable (Failed)
|
||||
# 451 - RunCMake.add_library (Failed)
|
||||
# 452 - RunCMake.add_subdirectory (Failed)
|
||||
# 453 - RunCMake.add_test (Failed)
|
||||
# 454 - RunCMake.build_command (Failed)
|
||||
# 455 - RunCMake.execute_process (Failed)
|
||||
# 456 - RunCMake.export (Failed)
|
||||
# 457 - RunCMake.cmake_host_system_information (Failed)
|
||||
# 458 - RunCMake.cmake_language (Failed)
|
||||
# 459 - RunCMake.cmake_minimum_required (Failed)
|
||||
# 460 - RunCMake.cmake_parse_arguments (Failed)
|
||||
# 477 - RunCMake.define_property (Failed)
|
||||
# 478 - RunCMake.file (Failed)
|
||||
# 479 - RunCMake.file-CHMOD (Failed)
|
||||
# 480 - RunCMake.file-DOWNLOAD (Failed)
|
||||
# 481 - RunCMake.file-RPATH (Failed)
|
||||
# 483 - RunCMake.find_file (Failed)
|
||||
# 484 - RunCMake.find_library (Failed)
|
||||
# 485 - RunCMake.find_package (Failed)
|
||||
# 486 - RunCMake.find_path (Failed)
|
||||
# 487 - RunCMake.find_program (Failed)
|
||||
# 488 - RunCMake.foreach (Failed)
|
||||
# 491 - RunCMake.get_filename_component (Failed)
|
||||
# 492 - RunCMake.get_property (Failed)
|
||||
# 493 - RunCMake.if (Failed)
|
||||
# 494 - RunCMake.include (Failed)
|
||||
# 495 - RunCMake.include_directories (Failed)
|
||||
# 497 - RunCMake.list (Failed)
|
||||
# 498 - RunCMake.load_cache (Failed)
|
||||
# 499 - RunCMake.math (Failed)
|
||||
# 500 - RunCMake.message (Failed)
|
||||
# 501 - RunCMake.option (Failed)
|
||||
# 503 - RunCMake.project (Failed)
|
||||
# 504 - RunCMake.project_injected (Failed)
|
||||
# 508 - RunCMake.separate_arguments (Failed)
|
||||
# 509 - RunCMake.set_property (Failed)
|
||||
# 510 - RunCMake.string (Failed)
|
||||
# 512 - RunCMake.BundleUtilities (Failed)
|
||||
# 513 - RunCMake.try_compile (Failed)
|
||||
# 514 - RunCMake.try_run (Failed)
|
||||
# 515 - RunCMake.set (Failed)
|
||||
# 516 - RunCMake.variable_watch (Failed)
|
||||
# 517 - RunCMake.while (Failed)
|
||||
# 520 - RunCMake.alias_targets (Failed)
|
||||
# 521 - RunCMake.InterfaceLibrary (Failed)
|
||||
# 522 - RunCMake.no_install_prefix (Failed)
|
||||
# 523 - RunCMake.configure_file (Failed)
|
||||
# 524 - RunCMake.CTestTimeout (Failed)
|
||||
# 527 - RunCMake.CXXModules (Failed)
|
||||
# 530 - RunCMake.FindPkgConfig (Failed)
|
||||
# 532 - RunCMake.File_Archive (Failed)
|
||||
# 533 - RunCMake.File_Configure (Failed)
|
||||
# 534 - RunCMake.File_Generate (Failed)
|
||||
# 535 - RunCMake.ExportWithoutLanguage (Failed)
|
||||
# 537 - RunCMake.target_link_libraries (Failed)
|
||||
# 541 - RunCMake.target_link_libraries-LINK_LIBRARY (Failed)
|
||||
# 542 - RunCMake.target_link_libraries-LINK_GROUP (Failed)
|
||||
# 547 - RunCMake.target_compile_features (Failed)
|
||||
# 548 - RunCMake.target_compile_options (Failed)
|
||||
# 550 - RunCMake.target_sources (Failed)
|
||||
# 552 - RunCMake.CheckSourceCompiles (Failed)
|
||||
# 553 - RunCMake.CheckSourceRuns (Failed)
|
||||
# 554 - RunCMake.CheckModules (Failed)
|
||||
# 555 - RunCMake.CheckIPOSupported (Failed)
|
||||
# 556 - RunCMake.CommandLine (Timeout)
|
||||
# 557 - RunCMake.CommandLineTar (Failed)
|
||||
# 558 - RunCMake.install (Failed)
|
||||
# 559 - RunCMake.file-GET_RUNTIME_DEPENDENCIES (Failed)
|
||||
# 561 - RunCMake.CPackConfig (Failed)
|
||||
# 563 - RunCMake.ExternalProject (Failed)
|
||||
# 566 - RunCMake.CTestCommandLine (Failed)
|
||||
# 569 - RunCMake.IfacePaths_INCDIRS (Failed)
|
||||
# 581 - RunCMake.CPack_7Z (Failed)
|
||||
# 582 - RunCMake.CPack_TBZ2 (Failed)
|
||||
# 583 - RunCMake.CPack_TGZ (Failed)
|
||||
# 584 - RunCMake.CPack_TXZ (Failed)
|
||||
# 585 - RunCMake.CPack_TZ (Failed)
|
||||
# 586 - RunCMake.CPack_ZIP (Failed)
|
||||
# 587 - RunCMake.CPack_STGZ (Failed)
|
||||
# 588 - RunCMake.CPack_External (Failed)
|
||||
# 593 - RunCMake.UnityBuild (Failed)
|
||||
# 594 - RunCMake.CMakePresets (Failed)
|
||||
# 595 - RunCMake.CMakePresetsBuild (Failed)
|
||||
# 596 - RunCMake.CMakePresetsTest (Failed)
|
||||
# 597 - RunCMake.CMakePresetsPackage (Failed)
|
||||
# 598 - RunCMake.CMakePresetsWorkflow (Failed)
|
||||
# 599 - RunCMake.VerifyHeaderSets (Failed)
|
||||
# 600 - RunCMake.set_tests_properties (Failed)
|
||||
TEST()
|
||||
{
|
||||
# At least 6 tests crash, so it might be wise to add an "auto-kill" rule to debugger settings.
|
||||
cp bin/ctest Bootstrap.cmk/
|
||||
make test VERBOSE=1 ARGS="$jobArgs"
|
||||
}
|
||||
330
dev-build/cmake/cmake-3.31.2.recipe
Normal file
330
dev-build/cmake/cmake-3.31.2.recipe
Normal file
@@ -0,0 +1,330 @@
|
||||
SUMMARY="A cross-platform build system"
|
||||
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."
|
||||
HOMEPAGE="https://cmake.org/"
|
||||
COPYRIGHT="2002-2024 Kitware, Inc., Insight Consortium"
|
||||
LICENSE="CMake"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="42abb3f48f37dbd739cdfeb19d3712db0c5935ed5c2aef6c340f9ae9114238a2"
|
||||
PATCHES="cmake-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
cmake$secondaryArchSuffix = $portVersionCompat
|
||||
cmd:ccmake = $portVersionCompat
|
||||
cmd:cmake = $portVersionCompat
|
||||
cmd:cpack = $portVersionCompat
|
||||
cmd:ctest = $portVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libarchive$secondaryArchSuffix
|
||||
# lib:libcppdap$secondaryArchSuffix # use the embedded copy to avoid circular deps.
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libexpat$secondaryArchSuffix
|
||||
lib:libjsoncpp$secondaryArchSuffix
|
||||
lib:libform$secondaryArchSuffix # from ncurses.
|
||||
lib:libncurses$secondaryArchSuffix
|
||||
lib:librhash$secondaryArchSuffix
|
||||
lib:libstdc++$secondaryArchSuffix
|
||||
lib:libuv$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
# Theres are never linked to the resulting "cmds:"s. See note on BUILD_REQUIRES.
|
||||
# lib:libbz2$secondaryArchSuffix
|
||||
# lib:liblzma$secondaryArchSuffix
|
||||
# lib:libnghttp2$secondaryArchSuffix
|
||||
# lib:libzstd$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libarchive$secondaryArchSuffix
|
||||
# devel:libcppdap$secondaryArchSuffix # use the embedded copy to avoid circular deps.
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libexpat$secondaryArchSuffix
|
||||
devel:libjsoncpp$secondaryArchSuffix >= 25
|
||||
devel:libncurses$secondaryArchSuffix
|
||||
devel:librhash$secondaryArchSuffix
|
||||
devel:libuv$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
devel:nlohmann_json
|
||||
# The following do not appear to be used, nor with --system-libs, nor by enabling them
|
||||
# individually. Leaving them here just because they are mentioned in ./configure --help
|
||||
# and during the build process' output.
|
||||
# devel:libbz2$secondaryArchSuffix
|
||||
# devel:liblzma$secondaryArchSuffix
|
||||
# devel:libnghttp2$secondaryArchSuffix
|
||||
# devel:libzstd$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:grep
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:sed
|
||||
cmd:which
|
||||
"
|
||||
|
||||
defineDebugInfoPackage cmake$secondaryArchSuffix \
|
||||
$prefix/bin/ccmake \
|
||||
$prefix/bin/cmake \
|
||||
$prefix/bin/cpack \
|
||||
$prefix/bin/ctest
|
||||
|
||||
|
||||
BUILD()
|
||||
{
|
||||
export LDFLAGS="-lbsd"
|
||||
|
||||
# not an autotools configure
|
||||
# --system-libs doesn't allow --no-system-* overrides
|
||||
./configure --prefix=$prefix \
|
||||
--datadir=/$relativeDataDir/cmake \
|
||||
--docdir=/$relativeDocDir \
|
||||
--mandir=/$relativeManDir \
|
||||
--xdgdatadir=/$relativeDataDir \
|
||||
--no-system-libs \
|
||||
--system-curl \
|
||||
--system-expat \
|
||||
--system-jsoncpp \
|
||||
--system-libarchive \
|
||||
--system-librhash \
|
||||
--system-libuv \
|
||||
--system-zlib \
|
||||
--bootstrap-system-libuv \
|
||||
--bootstrap-system-jsoncpp \
|
||||
--bootstrap-system-librhash \
|
||||
--parallel=${jobArgs#-j}
|
||||
# These do not seem to be used anyway (libarchive at least links to libz/libzstd):
|
||||
# --system-bzip2 --system-liblzma --system-zstd, --system-nghttp2
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
}
|
||||
|
||||
|
||||
# For reference: version 3.30.3
|
||||
# x86_32 (for a build with cmake-gui). Took around 140 minutes.
|
||||
# 72% tests passed, 189 tests failed out of 676
|
||||
#
|
||||
# version 3.30.5: x86_64.
|
||||
# 69% tests passed, 197 tests failed out of 637
|
||||
# The following tests FAILED:
|
||||
# 6 - kwsys.testSystemTools (Failed)
|
||||
# 26 - FindPackageTest (Failed)
|
||||
# 59 - ExportImport (Failed) CUDA
|
||||
# 68 - StagingPrefix (Failed)
|
||||
# 83 - Module.ExternalData (Failed)
|
||||
# 144 - InstallMode-COPY (Failed)
|
||||
# 145 - InstallMode-REL_SYMLINK (Failed)
|
||||
# 146 - InstallMode-REL_SYMLINK_OR_COPY (Failed)
|
||||
# 147 - InstallMode-ABS_SYMLINK (Failed)
|
||||
# 148 - InstallMode-ABS_SYMLINK_OR_COPY (Failed)
|
||||
# 149 - InstallMode-SYMLINK (Failed)
|
||||
# 150 - InstallMode-SYMLINK_OR_COPY (Failed)
|
||||
# 205 - CTestCoverageCollectGCOV (Failed)
|
||||
# 247 - CTestTestTimeout (Failed)
|
||||
# 281 - CMakeLib.testUVProcessChain (Failed)
|
||||
# 318 - RunCMake.CMP0019 (Failed)
|
||||
# 319 - RunCMake.CMP0022 (Failed)
|
||||
# 320 - RunCMake.CMP0026 (Failed)
|
||||
# 322 - RunCMake.CMP0037 (Failed)
|
||||
# 323 - RunCMake.CMP0038 (Failed)
|
||||
# 324 - RunCMake.CMP0039 (Failed)
|
||||
# 325 - RunCMake.CMP0040 (Failed)
|
||||
# 326 - RunCMake.CMP0041 (Failed)
|
||||
# 327 - RunCMake.CMP0043 (Failed)
|
||||
# 328 - RunCMake.CMP0045 (Failed)
|
||||
# 329 - RunCMake.CMP0046 (Failed)
|
||||
# 330 - RunCMake.CMP0049 (Failed)
|
||||
# 331 - RunCMake.CMP0050 (Failed)
|
||||
# 332 - RunCMake.CMP0051 (Failed)
|
||||
# 333 - RunCMake.CMP0053 (Failed)
|
||||
# 334 - RunCMake.CMP0054 (Failed)
|
||||
# 335 - RunCMake.CMP0055 (Failed)
|
||||
# 336 - RunCMake.CMP0057 (Failed)
|
||||
# 337 - RunCMake.CMP0059 (Failed)
|
||||
# 338 - RunCMake.CMP0060 (Failed)
|
||||
# 339 - RunCMake.CMP0064 (Failed)
|
||||
# 340 - RunCMake.CMP0069 (Failed)
|
||||
# 341 - RunCMake.CMP0081 (Failed)
|
||||
# 342 - RunCMake.CMP0102 (Failed)
|
||||
# 343 - RunCMake.CMP0106 (Failed)
|
||||
# 344 - RunCMake.CMP0111 (Failed)
|
||||
# 345 - RunCMake.CMP0115 (Failed)
|
||||
# 346 - RunCMake.CMP0118 (Failed)
|
||||
# 347 - RunCMake.CMP0119 (Failed)
|
||||
# 348 - RunCMake.CMP0121 (Failed)
|
||||
# 349 - RunCMake.CMP0126 (Failed)
|
||||
# 351 - RunCMake.CMP0135 (Failed)
|
||||
# 352 - RunCMake.CMP0139 (Failed)
|
||||
# 353 - RunCMake.CMP0152 (Failed)
|
||||
# 354 - RunCMake.CMP0153 (Failed)
|
||||
# 355 - RunCMake.CMP0156 (Failed)
|
||||
# 356 - RunCMake.CMP0160 (Failed)
|
||||
# 357 - RunCMake.CMP0163 (Failed)
|
||||
# 360 - RunCMake.CMP0170 (Failed)
|
||||
# 362 - RunCMake.CMP0173 (Failed)
|
||||
# 363 - RunCMake.CMP0065 (Failed)
|
||||
# 364 - RunCMake.Make (Failed)
|
||||
# 366 - RunCMake.CTest (Failed)
|
||||
# 368 - RunCMake.ABI (Failed) CUDA
|
||||
# 370 - RunCMake.AutogenNoQt (Failed)
|
||||
# 371 - RunCMake.BuildDepends (Failed) Fortran
|
||||
# 374 - RunCMake.CMakeDependentOption (Failed)
|
||||
# 378 - RunCMake.CompilerChange (Failed)
|
||||
# 379 - RunCMake.CompilerNotFound (Failed)
|
||||
# 382 - RunCMake.Configure (Failed)
|
||||
# 383 - RunCMake.DisallowedCommands (Failed)
|
||||
# 387 - RunCMake.ExternalData (Failed)
|
||||
# 389 - RunCMake.FPHSA (Failed)
|
||||
# 390 - RunCMake.FileAPI (Failed)
|
||||
# 392 - RunCMake.FindBoost (Failed)
|
||||
# 394 - RunCMake.FindOpenGL (Failed)
|
||||
# 399 - RunCMake.GenEx-LINK_LANGUAGE (Failed)
|
||||
# 400 - RunCMake.GenEx-LINK_LANG_AND_ID (Failed)
|
||||
# 403 - RunCMake.GenEx-LINK_LIBRARY (Failed)
|
||||
# 404 - RunCMake.GenEx-LINK_GROUP (Failed)
|
||||
# 405 - RunCMake.GenEx-TARGET_FILE (Failed)
|
||||
# 407 - RunCMake.GenEx-GENEX_EVAL (Failed)
|
||||
# 408 - RunCMake.GenEx-TARGET_PROPERTY (Failed)
|
||||
# 411 - RunCMake.GenEx-PATH_EQUAL (Failed)
|
||||
# 413 - RunCMake.GeneratorExpression (Failed)
|
||||
# 415 - RunCMake.GeneratorInstance (Failed)
|
||||
# 416 - RunCMake.GeneratorPlatform (Failed)
|
||||
# 417 - RunCMake.GeneratorToolset (Failed)
|
||||
# 418 - RunCMake.GetPrerequisites (Failed)
|
||||
# 419 - RunCMake.GNUInstallDirs (Failed)
|
||||
# 420 - RunCMake.GoogleTest (Failed)
|
||||
# 422 - RunCMake.Languages (Failed)
|
||||
# 424 - RunCMake.LinkItemValidation (Failed)
|
||||
# 426 - RunCMake.ObjectLibrary (Failed)
|
||||
# 429 - RunCMake.RuntimePath (Failed)
|
||||
# 434 - RunCMake.TargetObjects (Failed)
|
||||
# 435 - RunCMake.TargetProperties (Failed)
|
||||
# 436 - RunCMake.ToolchainFile (Failed)
|
||||
# 437 - RunCMake.find_dependency (Failed)
|
||||
# 438 - RunCMake.CompileDefinitions (Failed)
|
||||
# 440 - RunCMake.CompileFeatures (Failed)
|
||||
# 442 - RunCMake.PolicyScope (Failed)
|
||||
# 444 - RunCMake.WriteCompilerDetectionHeader (Failed)
|
||||
# 447 - RunCMake.VisibilityPreset (Failed)
|
||||
# 448 - RunCMake.CompatibleInterface (Failed)
|
||||
# 449 - RunCMake.Syntax (Failed)
|
||||
# 451 - RunCMake.MaxRecursionDepth (Failed)
|
||||
# 452 - RunCMake.add_custom_command (Failed)
|
||||
# 453 - RunCMake.add_custom_target (Failed)
|
||||
# 455 - RunCMake.add_executable (Failed)
|
||||
# 456 - RunCMake.add_library (Failed)
|
||||
# 457 - RunCMake.add_subdirectory (Failed) Fortran
|
||||
# 458 - RunCMake.add_test (Failed)
|
||||
# 459 - RunCMake.build_command (Failed)
|
||||
# 460 - RunCMake.execute_process (Failed)
|
||||
# 461 - RunCMake.export (Failed)
|
||||
# 462 - RunCMake.cmake_host_system_information (Failed)
|
||||
# 463 - RunCMake.cmake_language (Failed)
|
||||
# 464 - RunCMake.cmake_minimum_required (Failed)
|
||||
# 465 - RunCMake.cmake_parse_arguments (Failed)
|
||||
# 467 - RunCMake.cmake_pkg_config (Failed)
|
||||
# 483 - RunCMake.define_property (Failed)
|
||||
# 484 - RunCMake.file (Failed)
|
||||
# 485 - RunCMake.file-CHMOD (Failed)
|
||||
# 486 - RunCMake.file-DOWNLOAD (Failed)
|
||||
# 487 - RunCMake.file-MAKE_DIRECTORY (Failed)
|
||||
# 488 - RunCMake.file-RPATH (Failed)
|
||||
# 490 - RunCMake.find_file (Failed)
|
||||
# 491 - RunCMake.find_library (Failed)
|
||||
# 492 - RunCMake.find_package (Failed)
|
||||
# 493 - RunCMake.find_path (Failed)
|
||||
# 494 - RunCMake.find_program (Failed)
|
||||
# 495 - RunCMake.foreach (Failed)
|
||||
# 498 - RunCMake.get_filename_component (Failed)
|
||||
# 499 - RunCMake.get_property (Failed)
|
||||
# 500 - RunCMake.if (Failed)
|
||||
# 501 - RunCMake.include (Failed)
|
||||
# 502 - RunCMake.include_directories (Failed)
|
||||
# 504 - RunCMake.list (Failed)
|
||||
# 505 - RunCMake.load_cache (Failed)
|
||||
# 506 - RunCMake.math (Failed)
|
||||
# 507 - RunCMake.message (Failed)
|
||||
# 508 - RunCMake.option (Failed)
|
||||
# 510 - RunCMake.project (Failed)
|
||||
# 511 - RunCMake.project_injected (Failed)
|
||||
# 515 - RunCMake.separate_arguments (Failed)
|
||||
# 516 - RunCMake.set_property (Failed)
|
||||
# 517 - RunCMake.string (Failed)
|
||||
# 519 - RunCMake.BundleUtilities (Failed)
|
||||
# 520 - RunCMake.try_compile (Failed) CUDA ISPC
|
||||
# 521 - RunCMake.try_run (Failed) Fortran
|
||||
# 522 - RunCMake.set (Failed)
|
||||
# 523 - RunCMake.variable_watch (Failed)
|
||||
# 524 - RunCMake.while (Failed)
|
||||
# 527 - RunCMake.alias_targets (Failed)
|
||||
# 528 - RunCMake.InterfaceLibrary (Failed)
|
||||
# 529 - RunCMake.no_install_prefix (Failed)
|
||||
# 530 - RunCMake.configure_file (Failed)
|
||||
# 531 - RunCMake.CTestTimeout (Failed)
|
||||
# 534 - RunCMake.CXXModules (Failed)
|
||||
# 537 - RunCMake.FindPkgConfig (Failed)
|
||||
# 539 - RunCMake.LinkLibrariesStrategy (Failed)
|
||||
# 540 - RunCMake.File_Archive (Failed)
|
||||
# 541 - RunCMake.File_Configure (Failed)
|
||||
# 542 - RunCMake.File_Generate (Failed)
|
||||
# 543 - RunCMake.ExportWithoutLanguage (Failed)
|
||||
# 545 - RunCMake.target_link_libraries (Failed)
|
||||
# 549 - RunCMake.target_link_libraries-LINK_LIBRARY (Failed)
|
||||
# 550 - RunCMake.target_link_libraries-LINK_GROUP (Failed)
|
||||
# 555 - RunCMake.target_compile_features (Failed)
|
||||
# 556 - RunCMake.target_compile_options (Failed)
|
||||
# 558 - RunCMake.target_sources (Failed)
|
||||
# 560 - RunCMake.CheckSourceCompiles (Failed) CUDA Fortran HIP ISPC
|
||||
# 561 - RunCMake.CheckSourceRuns (Failed) CUDA Fortran HIP
|
||||
# 562 - RunCMake.CheckModules (Failed)
|
||||
# 563 - RunCMake.CheckIPOSupported (Failed)
|
||||
# 564 - RunCMake.CommandLine (Failed)
|
||||
# 565 - RunCMake.CommandLineTar (Failed)
|
||||
# 566 - RunCMake.install (Failed) ISPC
|
||||
# 567 - RunCMake.file-GET_RUNTIME_DEPENDENCIES (Failed)
|
||||
# 569 - RunCMake.CPackConfig (Failed)
|
||||
# 571 - RunCMake.ExternalProject (Failed)
|
||||
# 574 - RunCMake.CTestCommandLine (Failed)
|
||||
# 577 - RunCMake.IfacePaths_INCDIRS (Failed)
|
||||
# 589 - RunCMake.CPack_7Z (Failed)
|
||||
# 590 - RunCMake.CPack_TBZ2 (Failed)
|
||||
# 591 - RunCMake.CPack_TGZ (Failed)
|
||||
# 592 - RunCMake.CPack_TXZ (Failed)
|
||||
# 593 - RunCMake.CPack_TZ (Failed)
|
||||
# 594 - RunCMake.CPack_ZIP (Failed)
|
||||
# 595 - RunCMake.CPack_STGZ (Failed)
|
||||
# 596 - RunCMake.CPack_External (Failed)
|
||||
# 599 - RunCMake.PackageInfo (Failed)
|
||||
# 602 - RunCMake.UnityBuild (Failed) CUDA
|
||||
# 603 - RunCMake.CMakePresets (Failed)
|
||||
# 604 - RunCMake.CMakePresetsBuild (Failed)
|
||||
# 605 - RunCMake.CMakePresetsTest (Failed)
|
||||
# 606 - RunCMake.CMakePresetsPackage (Failed)
|
||||
# 607 - RunCMake.CMakePresetsWorkflow (Failed)
|
||||
# 608 - RunCMake.VerifyHeaderSets (Failed)
|
||||
# 609 - RunCMake.set_tests_properties (Failed)
|
||||
# 610 - RunCMake.Codegen (Failed)
|
||||
TEST()
|
||||
{
|
||||
# At least 6 tests crash, so it might be wise to add an "auto-kill" rule to debugger settings.
|
||||
cp bin/ctest Bootstrap.cmk/
|
||||
make test VERBOSE=1 ARGS="$jobArgs"
|
||||
}
|
||||
@@ -54,6 +54,7 @@ BUILD_REQUIRES="
|
||||
devel:libarchive$secondaryArchSuffix
|
||||
devel:libcppdap$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libncurses$secondaryArchSuffix
|
||||
devel:libexpat$secondaryArchSuffix
|
||||
devel:libjsoncpp$secondaryArchSuffix >= 25
|
||||
devel:libQt6Core$secondaryArchSuffix
|
||||
@@ -1,4 +1,4 @@
|
||||
From 953e286effccd2b5f2de0f7439801bacd190eaed Mon Sep 17 00:00:00 2001
|
||||
From e8ab324a5becd49d55d58f2334a706763afe4196 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.
|
||||
@@ -21,17 +21,17 @@ index 2249ab1..b010f9a 100644
|
||||
2.45.2
|
||||
|
||||
|
||||
From 2407bb01e0b655cbf1eb0d96bb9b6708839c4242 Mon Sep 17 00:00:00 2001
|
||||
From 7515ba97d5ffcf2f28a6d081d33538efbec58a60 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 88878fe..d390a8c 100755
|
||||
index 53358d5..95e1631 100755
|
||||
--- a/bootstrap
|
||||
+++ b/bootstrap
|
||||
@@ -1794,6 +1794,9 @@ else
|
||||
@@ -1799,6 +1799,9 @@ else
|
||||
uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700"
|
||||
libs="${libs} -lsocket"
|
||||
;;
|
||||
@@ -45,7 +45,7 @@ index 88878fe..d390a8c 100755
|
||||
2.45.2
|
||||
|
||||
|
||||
From 42c2374e8492b212b2c88adbf344e056b7e2c9de Mon Sep 17 00:00:00 2001
|
||||
From b91622a227972c2fc2f0c28d505c0841136d5c9e 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
|
||||
@@ -80,7 +80,7 @@ index 83e8b61..314f239 100644
|
||||
2.45.2
|
||||
|
||||
|
||||
From 7dffaf6ca08dd1ad927a844f27b1ac63943d2cb0 Mon Sep 17 00:00:00 2001
|
||||
From 703627de82b442f364dd7c18583c4a16e7b01f79 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
|
||||
@@ -106,7 +106,7 @@ index 7d9a737..74b17f5 100644
|
||||
2.45.2
|
||||
|
||||
|
||||
From 9fe2a3b5ec6750bce77cb5f6d8741d97f814599d Mon Sep 17 00:00:00 2001
|
||||
From d36207221d0c705e4100df4a130a2e0890888222 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.
|
||||
@@ -130,14 +130,14 @@ index 74b17f5..41d77bb 100644
|
||||
2.45.2
|
||||
|
||||
|
||||
From ce12105b038122074e301adbe39f15684b4b3f82 Mon Sep 17 00:00:00 2001
|
||||
From c7f14c9733348367b85b36aef88a7755f793bce4 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 3f705a9..404d833 100644
|
||||
index 83c818d..668ed54 100644
|
||||
--- a/Modules/Compiler/GNU.cmake
|
||||
+++ b/Modules/Compiler/GNU.cmake
|
||||
@@ -49,7 +49,9 @@ macro(__compiler_gnu lang)
|
||||
@@ -150,12 +150,12 @@ index 3f705a9..404d833 100644
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
# define flags for linker depfile generation
|
||||
# Initial configuration flags.
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
From a8a7d5c99a9c617872b331e8c428f14a2081303f Mon Sep 17 00:00:00 2001
|
||||
From 7e6ef9c60c83d57544ca3fab3baa1f2a240627f6 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/
|
||||
@@ -180,7 +180,7 @@ 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 344c250..b6cca06 100644
|
||||
index cc150fd..07a7c24 100644
|
||||
--- a/Source/cmFindPackageCommand.cxx
|
||||
+++ b/Source/cmFindPackageCommand.cxx
|
||||
@@ -2712,7 +2712,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
|
||||
@@ -199,7 +199,7 @@ index 344c250..b6cca06 100644
|
||||
2.45.2
|
||||
|
||||
|
||||
From 34d3479017abc267f6cc5034ed8b0d8dfe6e3dbb Mon Sep 17 00:00:00 2001
|
||||
From 2c202127185a7a64ea788285fa833ff423277253 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.
|
||||
@@ -222,14 +222,14 @@ index da20534..97bcdc2 100644
|
||||
2.45.2
|
||||
|
||||
|
||||
From b0c7a8ff3ee3aca67dcf6bf3d3a62ebc751688fc Mon Sep 17 00:00:00 2001
|
||||
From c00e68a4fe0cf9944adca0a9ac8bb9171240150b 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 081bd7d..6c33a8a 100644
|
||||
index 79a562c..c896be0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -137,7 +137,7 @@ option(CMake_BUILD_PCH "Compile CMake with precompiled headers" OFF)
|
||||
@@ -242,10 +242,10 @@ index 081bd7d..6c33a8a 100644
|
||||
AND NOT (CMAKE_CXX_COMPILER_ID STREQUAL "XLClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.1)
|
||||
AND NOT (CMAKE_CXX_COMPILER_ID STREQUAL "LCC" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 1.23)
|
||||
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
|
||||
index 185ebfe..de9f4f8 100644
|
||||
index c4cd101..00f3209 100644
|
||||
--- a/Source/CMakeLists.txt
|
||||
+++ b/Source/CMakeLists.txt
|
||||
@@ -835,6 +835,9 @@ if(CMake_ENABLE_DEBUGGER)
|
||||
@@ -865,6 +865,9 @@ if(CMake_ENABLE_DEBUGGER)
|
||||
)
|
||||
endif()
|
||||
target_link_libraries(CMakeLib PUBLIC cppdap::cppdap)
|
||||
@@ -259,17 +259,17 @@ index 185ebfe..de9f4f8 100644
|
||||
2.45.2
|
||||
|
||||
|
||||
From c6f6129aace253e8cb0afda8acac231d652ad5a5 Mon Sep 17 00:00:00 2001
|
||||
From 1a85574845a27418df36db2d6cf5c0b0e9bea465 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 428d649..fab481e 100644
|
||||
index 933d649..666f543 100644
|
||||
--- a/Source/kwsys/SystemInformation.cxx
|
||||
+++ b/Source/kwsys/SystemInformation.cxx
|
||||
@@ -5003,6 +5003,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
|
||||
@@ -4957,6 +4957,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
|
||||
this->TotalVirtualMemory = 0;
|
||||
this->AvailableVirtualMemory = 0;
|
||||
|
||||
@@ -277,7 +277,7 @@ index 428d649..fab481e 100644
|
||||
// Retrieve cpuid_info union for cpu 0
|
||||
cpuid_info cpu_info;
|
||||
get_cpuid(&cpu_info, 0, 0);
|
||||
@@ -5038,6 +5039,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
|
||||
@@ -4992,6 +4993,7 @@ bool SystemInformationImplementation::QueryHaikuInfo()
|
||||
|
||||
// Chip Extended Model
|
||||
this->ChipID.ExtendedModel = cpu_info.eax_1.extended_model;
|
||||
@@ -289,7 +289,7 @@ index 428d649..fab481e 100644
|
||||
2.45.2
|
||||
|
||||
|
||||
From fb94f94843cfa04242f1f43bb4e0a2d9e185ca93 Mon Sep 17 00:00:00 2001
|
||||
From 3fb60e7cf0c62cc07339f2018e4e1dc89124a0f9 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 08ab9c0..89e49ec 100644
|
||||
index c741ec1..30b638f 100644
|
||||
--- a/Modules/FindPython/Support.cmake
|
||||
+++ b/Modules/FindPython/Support.cmake
|
||||
@@ -1360,6 +1360,9 @@ if ("NumPy" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
|
||||
@@ -1434,6 +1434,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")
|
||||
@@ -316,7 +316,7 @@ index 08ab9c0..89e49ec 100644
|
||||
2.45.2
|
||||
|
||||
|
||||
From 81bee22cbfc3ea3c3d6ea8230e282fd1487ae418 Mon Sep 17 00:00:00 2001
|
||||
From c48ed5d6b4c94e309b9c0267d1660a00077df209 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.
|
||||
@@ -327,12 +327,11 @@ Just a quick swap, to help CMake find Python's headers on 32 bits Haiku.
|
||||
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 35a1d67..fb38259 100644
|
||||
index 30b638f..61780d7 100644
|
||||
--- a/Modules/FindPython/Support.cmake
|
||||
+++ b/Modules/FindPython/Support.cmake
|
||||
@@ -343,11 +343,11 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
|
||||
@@ -334,11 +334,11 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
|
||||
elseif (_PGPS_INCLUDE)
|
||||
set (suffixes "${abi}")
|
||||
if (suffixes)
|
||||
@@ -351,7 +350,7 @@ index 35a1d67..fb38259 100644
|
||||
2.45.2
|
||||
|
||||
|
||||
From ae78fe5259866354c4e6cfbe8de25efaf4c9a974 Mon Sep 17 00:00:00 2001
|
||||
From ade78116854649213b4a7bc9550b38bf0f85d607 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.
|
||||
Reference in New Issue
Block a user