From 19cf9ba90fc19f34579473d045e4da7ae78f799f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 23 Feb 2022 16:58:07 +0100 Subject: [PATCH] cmake: bump version tests need to be rerun to correctly complete, same on Linux. --- ...make-3.21.3.recipe => cmake-3.22.2.recipe} | 42 +++++--- ...-3.21.3.patchset => cmake-3.22.2.patchset} | 100 +++++++----------- 2 files changed, 62 insertions(+), 80 deletions(-) rename dev-util/cmake/{cmake-3.21.3.recipe => cmake-3.22.2.recipe} (70%) rename dev-util/cmake/patches/{cmake-3.21.3.patchset => cmake-3.22.2.patchset} (76%) diff --git a/dev-util/cmake/cmake-3.21.3.recipe b/dev-util/cmake/cmake-3.22.2.recipe similarity index 70% rename from dev-util/cmake/cmake-3.21.3.recipe rename to dev-util/cmake/cmake-3.22.2.recipe index a41149553..812fb6c02 100644 --- a/dev-util/cmake/cmake-3.21.3.recipe +++ b/dev-util/cmake/cmake-3.22.2.recipe @@ -7,9 +7,9 @@ of your choice." HOMEPAGE="https://cmake.org/" COPYRIGHT="2002-2021 Kitware, Inc., Insight Consortium" LICENSE="CMake" -REVISION="2" -SOURCE_URI="https://cmake.org/files/v3.21/cmake-$portVersion.tar.gz" -CHECKSUM_SHA256="d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f" +REVISION="1" +SOURCE_URI="https://cmake.org/files/v3.22/cmake-$portVersion.tar.gz" +CHECKSUM_SHA256="3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced" SOURCE_DIR="cmake-$portVersion" PATCHES="cmake-$portVersion.patchset" @@ -30,6 +30,7 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libncurses$secondaryArchSuffix lib:librhash$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix lib:libuv$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -48,6 +49,7 @@ REQUIRES_gui=" lib:libQt5Gui$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:librhash$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix lib:libuv$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -111,20 +113,26 @@ INSTALL() TEST() { #x86_64 -#98% tests passed, 13 tests failed out of 594 -# 5 - kwsys.testSystemTools (Failed) -# 26 - FindPackageTest (Failed) -# 58 - ExportImport (Failed) -# 66 - StagingPrefix (Failed) -# 244 - CTestTestTimeout (Failed) -# 274 - CMakeLib.testUVProcessChain (Failed) -# 279 - CMakeLib.testCMFilesystemPath (Signal 21) -# 332 - RunCMake.Make (Failed) -# 422 - RunCMake.file (Failed) -# 459 - RunCMake.no_install_prefix (Failed) -# 487 - RunCMake.CommandLine (Failed) -# 521 - RunCMake.PrecompileHeaders (Failed) -# 523 - RunCMake.CMakePresets (Failed) +#97% tests passed, 19 tests failed out of 621 +# 6 - kwsys.testSystemTools (Failed) +# 27 - FindPackageTest (Failed) +# 59 - 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) +# 253 - CTestTestTimeout (Failed) +# 283 - CMakeLib.testUVProcessChain (Failed) +# 401 - RunCMake.find_dependency (Failed) +# 444 - RunCMake.file (Failed) +# 482 - RunCMake.no_install_prefix (Failed) +# 510 - RunCMake.CommandLine (Failed) +# 545 - RunCMake.PrecompileHeaders (Failed) cp bin/ctest Bootstrap.cmk/ make test VERBOSE=1 diff --git a/dev-util/cmake/patches/cmake-3.21.3.patchset b/dev-util/cmake/patches/cmake-3.22.2.patchset similarity index 76% rename from dev-util/cmake/patches/cmake-3.21.3.patchset rename to dev-util/cmake/patches/cmake-3.22.2.patchset index 056e48538..d419abc75 100644 --- a/dev-util/cmake/patches/cmake-3.21.3.patchset +++ b/dev-util/cmake/patches/cmake-3.22.2.patchset @@ -1,53 +1,4 @@ -From 1b3e721bb854f2a0e4083ced3b2654f1f66a2cbd Mon Sep 17 00:00:00 2001 -From: Jerome Duval -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 9a474e3..d55b856 100644 ---- a/Source/cmELF.cxx -+++ b/Source/cmELF.cxx -@@ -20,17 +20,18 @@ - // Include the ELF format information system header. - #if defined(__OpenBSD__) - # include --#elif defined(__HAIKU__) --# include --# include --using Elf32_Ehdr = struct Elf32_Ehdr; --using Elf32_Shdr = struct Elf32_Shdr; --using Elf32_Sym = struct Elf32_Sym; --using Elf32_Rel = struct Elf32_Rel; --using Elf32_Rela = struct Elf32_Rela; -+#else -+# include -+# ifndef ELFMAG0 - # define ELFMAG0 0x7F -+# endif -+# ifndef ELFMAG1 - # define ELFMAG1 'E' -+# endif -+# ifndef ELFMAG2 - # define ELFMAG2 'L' -+# endif -+# ifndef ELFMAG3 - # define ELFMAG3 'F' - # define ET_NONE 0 - # define ET_REL 1 -@@ -42,6 +43,7 @@ using Elf32_Rela = struct Elf32_Rela; - # define EM_PPC 20 - #else - # include -+# endif - #endif - #if defined(__sun) - # include // For dynamic section information --- -2.30.2 - - -From 1dc5dfcefd65f3a35b2c12aeb53cb0b9e970aefa Mon Sep 17 00:00:00 2001 +From e7bb07853e20ffe3812320cb7fadfee6e42dd080 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. @@ -70,17 +21,17 @@ index 283a3eb..8fd73f2 100644 2.30.2 -From 6147f7c4ec0414755a214b51d33a197f399007eb Mon Sep 17 00:00:00 2001 +From ee23112124febc01d50f44803aebc00d12b4b3a2 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 7 Sep 2019 17:29:56 +0200 Subject: links against libnetwork diff --git a/bootstrap b/bootstrap -index dc5ed0b..0fceaa8 100755 +index a487375..b733b42 100755 --- a/bootstrap +++ b/bootstrap -@@ -1702,6 +1702,9 @@ else +@@ -1705,6 +1705,9 @@ else uv_c_flags="${uv_c_flags} -D_XOPEN_SOURCE=700" libs="${libs} -lsocket" ;; @@ -94,17 +45,17 @@ index dc5ed0b..0fceaa8 100755 2.30.2 -From 70c110f38cbc585bf57e9528e8b3bcffa01f93ed Mon Sep 17 00:00:00 2001 +From 1969848606683b6613871f57034147349e47bff6 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 7 Sep 2019 23:46:47 +0200 Subject: bootstrap uses cmlibuv diff --git a/Utilities/cmlibuv/src/unix/core.c b/Utilities/cmlibuv/src/unix/core.c -index e6d61ee..9d9bba9 100644 +index 4245e02..e634c70 100644 --- a/Utilities/cmlibuv/src/unix/core.c +++ b/Utilities/cmlibuv/src/unix/core.c -@@ -1423,7 +1423,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) { +@@ -1426,7 +1426,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) { return UV_EINVAL; errno = 0; @@ -114,7 +65,7 @@ index e6d61ee..9d9bba9 100644 if (r == -1 && errno != 0) return UV__ERR(errno); -@@ -1437,8 +1439,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) { +@@ -1440,8 +1442,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) { if (priority < UV_PRIORITY_HIGHEST || priority > UV_PRIORITY_LOW) return UV_EINVAL; @@ -129,7 +80,7 @@ index e6d61ee..9d9bba9 100644 2.30.2 -From e54ae0dfc52e15d6f39f0bfff5c3281c24676f4e Mon Sep 17 00:00:00 2001 +From 77ddef9f2837d244fafa9049e4624fdab023f3ce Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 21 Sep 2019 15:30:44 +0200 Subject: also detect secondary arch with clang. @@ -154,7 +105,7 @@ index b8e3ba6..08b11a4 100644 2.30.2 -From 12a3896bb9dbd39eb0f49e5ad2a4ab6e8dca096f Mon Sep 17 00:00:00 2001 +From 4ccc91554689dbc64cf1e077e7cebeb2018ad40f 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. @@ -178,7 +129,7 @@ index 08b11a4..9a8ae60 100644 2.30.2 -From 7ad86704b376309a990b43273cb9170215d2b1b8 Mon Sep 17 00:00:00 2001 +From c4503c077c11b804c75e0d57a89660a083bf9b20 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 @@ -203,7 +154,7 @@ index 928e726..87d0167 100644 2.30.2 -From 3d806e79d74e07bf8208b4e2f650b757edf9c18e Mon Sep 17 00:00:00 2001 +From b054b8fc7190ad1188ce4aeb3aa69561725428e4 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/ @@ -229,10 +180,10 @@ index e82bec3..7e5f577 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 fba736e..c437582 100644 +index 335ebbe..0f64bbe 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx -@@ -2317,7 +2317,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in) +@@ -2335,7 +2335,11 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in) common.emplace_back("libx32"); } common.emplace_back("lib"); @@ -247,3 +198,26 @@ index fba736e..c437582 100644 -- 2.30.2 + +From d3707e69837792212ff7aa8475c4a3f6e972eb1b 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. + + +diff --git a/Utilities/cmzstd/lib/common/zstd_trace.h b/Utilities/cmzstd/lib/common/zstd_trace.h +index 485cadf..95dc81b 100644 +--- a/Utilities/cmzstd/lib/common/zstd_trace.h ++++ b/Utilities/cmzstd/lib/common/zstd_trace.h +@@ -20,7 +20,7 @@ extern "C" { + /* weak symbol support */ + #if !defined(ZSTD_HAVE_WEAK_SYMBOLS) && defined(__GNUC__) && \ + !defined(__APPLE__) && !defined(_WIN32) && !defined(__MINGW32__) && \ +- !defined(__CYGWIN__) && !defined(_AIX) ++ !defined(__CYGWIN__) && !defined(_AIX) && !defined(__HAIKU__) + # define ZSTD_HAVE_WEAK_SYMBOLS 1 + #else + # define ZSTD_HAVE_WEAK_SYMBOLS 0 +-- +2.30.2 +