From 0e9100e3c2568d9f6b27a5bed60a774011a89b2c Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Sun, 8 May 2022 15:41:49 +0200 Subject: [PATCH] Ports/cmake: Update cmake to version 3.23.1 --- Ports/AvailablePorts.md | 2 +- Ports/cmake/package.sh | 4 ++-- .../patches/0001-kwsys-Don-t-use-siginfo.patch | 14 +++++++------- Ports/cmake/patches/0002-bin-bash.patch | 8 ++++---- Ports/cmake/patches/0003-Platform-SerenityOS.patch | 6 +++--- .../cmake/patches/0004-cmcurl-Include-unistd.patch | 10 +++++----- ...rl-Use-struct-stat-and-include-sys-stat.h.patch | 10 +++++----- Ports/cmake/patches/0006-CMake-Disable-tests.patch | 10 +++++----- Ports/cmake/patches/ReadMe.md | 3 ++- 9 files changed, 34 insertions(+), 33 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 9999c8ef85..0e89d8cad0 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -23,7 +23,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`c-ray`](c-ray/) | C-Ray | 8f30eb9 | https://github.com/vkoskiv/c-ray | | [`chester`](chester/) | Chester Gameboy Emulator | | https://github.com/veikkos/chester | | [`citron`](citron/) | Citron Programming Language | 0.0.9.3 | https://github.com/alimpfard/citron | -| [`cmake`](cmake/) | CMake | 3.23.0 | https://cmake.org/ | +| [`cmake`](cmake/) | CMake | 3.23.1 | https://cmake.org/ | | [`cmatrix`](cmatrix/) | cmatrix | 3112b12 | https://github.com/abishekvashok/cmatrix | | [`composer`](composer/) | Composer | 2.3.4 | https://getcomposer.org/ | | [`coreutils`](coreutils/) | GNU core utilities | 9.1 | https://www.gnu.org/software/coreutils/ | diff --git a/Ports/cmake/package.sh b/Ports/cmake/package.sh index 77932aa41c..d6e3f8a812 100755 --- a/Ports/cmake/package.sh +++ b/Ports/cmake/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port=cmake -version=3.23.0 +version=3.23.1 useconfigure=true -files="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz cmake-$version.tar.gz 5ab0a12f702f44013be7e19534cd9094d65cc9fe7b2cd0f8c9e5318e0fe4ac82" +files="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz cmake-$version.tar.gz 33fd10a8ec687a4d0d5b42473f10459bb92b3ae7def2b745dc10b192760869f3" auth_type=sha256 depends=("bash" "make" "sed" "ncurses" "libuv" "openssl") configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=1" "-DCMAKE_USE_OPENSSL=ON" "-GNinja") diff --git a/Ports/cmake/patches/0001-kwsys-Don-t-use-siginfo.patch b/Ports/cmake/patches/0001-kwsys-Don-t-use-siginfo.patch index 8efd34f63d..0a68462aae 100644 --- a/Ports/cmake/patches/0001-kwsys-Don-t-use-siginfo.patch +++ b/Ports/cmake/patches/0001-kwsys-Don-t-use-siginfo.patch @@ -1,7 +1,7 @@ -From b113080ce2b9538c16433df1a4074aa4ab538a22 Mon Sep 17 00:00:00 2001 +From 5e5e6f2f0c25da400093818cbc3c1ae277a1df23 Mon Sep 17 00:00:00 2001 From: AnotherTest Date: Fri, 12 Feb 2021 13:42:50 +0330 -Subject: [PATCH 2/7] kwsys: Don't use siginfo +Subject: [PATCH 1/6] kwsys: Don't use siginfo We don't support SIGINFO. This patch removes uses of SIGINFO. @@ -15,10 +15,10 @@ We don't support SIGINFO. This patch removes uses of SIGINFO. 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c -index a8a15ddb..5530814a 100644 +index 19bf982d..1ece4310 100644 --- a/Source/kwsys/ProcessUNIX.c +++ b/Source/kwsys/ProcessUNIX.c -@@ -105,7 +105,7 @@ static inline void kwsysProcess_usleep(unsigned int msec) +@@ -111,7 +111,7 @@ static inline void kwsysProcess_usleep(unsigned int msec) #endif /* Some platforms do not have siginfo on their signal handlers. */ @@ -28,7 +28,7 @@ index a8a15ddb..5530814a 100644 #endif diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx -index f2bf85f6..ac2ac4a3 100644 +index e6cc48f2..17fbd547 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -992,7 +992,7 @@ int GetFieldsFromCommand(const char* command, const char** fieldNames, @@ -40,7 +40,7 @@ index f2bf85f6..ac2ac4a3 100644 void StacktraceSignalHandler(int sigNo, siginfo_t* sigInfo, void* /*sigContext*/) { -@@ -4043,7 +4043,7 @@ when set print stack trace in response to common signals. +@@ -4051,7 +4051,7 @@ when set print stack trace in response to common signals. */ void SystemInformationImplementation::SetStackTraceOnError(int enable) { @@ -50,5 +50,5 @@ index f2bf85f6..ac2ac4a3 100644 static struct sigaction saABRTOrig; static struct sigaction saSEGVOrig; -- -2.34.1 +2.36.1 diff --git a/Ports/cmake/patches/0002-bin-bash.patch b/Ports/cmake/patches/0002-bin-bash.patch index ab78f08842..573dc55629 100644 --- a/Ports/cmake/patches/0002-bin-bash.patch +++ b/Ports/cmake/patches/0002-bin-bash.patch @@ -1,7 +1,7 @@ -From aaa210d6039aa02ff3bc7998d39c6befa791cfdd Mon Sep 17 00:00:00 2001 +From 75597807e541ebe1ae83345af9250a4113bf1480 Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Wed, 12 Jan 2022 22:15:37 +0330 -Subject: [PATCH 3/7] /bin/bash +Subject: [PATCH 2/6] /bin/bash This patch swaps out /bin/sh for /bin/bash in two scripts that need it. @@ -15,7 +15,7 @@ This patch swaps out /bin/sh for /bin/bash in two scripts that need it. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap b/bootstrap -index a487375a..8db931d1 100755 +index e0791d58..bde01283 100755 --- a/bootstrap +++ b/bootstrap @@ -1,4 +1,4 @@ @@ -34,5 +34,5 @@ index 11622160..0e6fc25d 100755 cmake_source_dir=`cd "\`dirname \"$0\"\`";pwd` exec "${cmake_source_dir}/bootstrap" "$@" -- -2.34.1 +2.36.1 diff --git a/Ports/cmake/patches/0003-Platform-SerenityOS.patch b/Ports/cmake/patches/0003-Platform-SerenityOS.patch index e1d03a57d6..e0905ab92e 100644 --- a/Ports/cmake/patches/0003-Platform-SerenityOS.patch +++ b/Ports/cmake/patches/0003-Platform-SerenityOS.patch @@ -1,7 +1,7 @@ -From e32762d8f7393337786d11d77a71843c80a23b0e Mon Sep 17 00:00:00 2001 +From 049e918181ba913bf992723dd805fb8066aae83b Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Wed, 12 Jan 2022 22:17:47 +0330 -Subject: [PATCH 4/7] Platform/SerenityOS +Subject: [PATCH 3/6] Platform/SerenityOS This patch adds the SerenityOS platform config file to CMake. @@ -46,5 +46,5 @@ index 00000000..952ff61a + +include(Platform/UnixPaths) -- -2.34.1 +2.36.1 diff --git a/Ports/cmake/patches/0004-cmcurl-Include-unistd.patch b/Ports/cmake/patches/0004-cmcurl-Include-unistd.patch index cc4bad1b96..b258e73310 100644 --- a/Ports/cmake/patches/0004-cmcurl-Include-unistd.patch +++ b/Ports/cmake/patches/0004-cmcurl-Include-unistd.patch @@ -1,9 +1,9 @@ -From ac1f5e51b8069e98a593a0f5ad25fdcd0328eca8 Mon Sep 17 00:00:00 2001 +From a65e8be0dbde0e23fed88f8ebdcdf8668b238b9c Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Wed, 12 Jan 2022 22:18:02 +0330 -Subject: [PATCH 5/7] cmcurl: Include unistd +Subject: [PATCH 4/6] cmcurl: Include unistd -Everyone gets this wrong. most platforms are very lax with these includes, but we're not one of them. +Everyone gets this wrong. Most platforms are very lax with these includes, but we're not one of them. - [X] Local? - [ ] Should be merged to upstream? @@ -14,7 +14,7 @@ Everyone gets this wrong. most platforms are very lax with these includes, but w 1 file changed, 1 insertion(+) diff --git a/Utilities/cmcurl/include/curl/multi.h b/Utilities/cmcurl/include/curl/multi.h -index 37f9829b..4a2b94fa 100644 +index 91cd95d3..9940748f 100644 --- a/Utilities/cmcurl/include/curl/multi.h +++ b/Utilities/cmcurl/include/curl/multi.h @@ -47,6 +47,7 @@ @@ -26,5 +26,5 @@ index 37f9829b..4a2b94fa 100644 #ifdef __cplusplus extern "C" { -- -2.34.1 +2.36.1 diff --git a/Ports/cmake/patches/0005-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch b/Ports/cmake/patches/0005-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch index c4324e3a1a..752feac4f0 100644 --- a/Ports/cmake/patches/0005-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch +++ b/Ports/cmake/patches/0005-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch @@ -1,9 +1,9 @@ -From 33e8e0bcf0b8d66267083c656c1f4d55b817dc68 Mon Sep 17 00:00:00 2001 +From 8094f0232a6c4c357ec8e2931d44399172123f47 Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Wed, 12 Jan 2022 22:18:23 +0330 -Subject: [PATCH 6/7] cmcurl: Use struct stat and include sys/stat.h +Subject: [PATCH 5/6] cmcurl: Use struct stat and include sys/stat.h -For unknown reasons, curl_setup_once.h does not include sys/stat.h. this patch includes sys/stat.h. +For unknown reasons, curl_setup_once.h does not include sys/stat.h. This patch includes sys/stat.h. - [ ] Local? - [ ] Should be merged to upstream? @@ -14,7 +14,7 @@ For unknown reasons, curl_setup_once.h does not include sys/stat.h. this patch i 1 file changed, 1 insertion(+) diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h -index 554dcc1e..dfb7859e 100644 +index 7421b670..b06c19d8 100644 --- a/Utilities/cmcurl/lib/curl_setup.h +++ b/Utilities/cmcurl/lib/curl_setup.h @@ -403,6 +403,7 @@ @@ -26,5 +26,5 @@ index 554dcc1e..dfb7859e 100644 #endif -- -2.34.1 +2.36.1 diff --git a/Ports/cmake/patches/0006-CMake-Disable-tests.patch b/Ports/cmake/patches/0006-CMake-Disable-tests.patch index 5de26813e2..2b68c33bba 100644 --- a/Ports/cmake/patches/0006-CMake-Disable-tests.patch +++ b/Ports/cmake/patches/0006-CMake-Disable-tests.patch @@ -1,7 +1,7 @@ -From fefbff0df0bdf95bf61e13feac2552af13f877ff Mon Sep 17 00:00:00 2001 +From f0ae38c0f10805a2f4359ee0052766c371ee8d54 Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Wed, 12 Jan 2022 22:18:57 +0330 -Subject: [PATCH 7/7] CMake: Disable tests +Subject: [PATCH 6/6] CMake: Disable tests We don't care about building tests for now, and it makes the compilation much faster. @@ -14,10 +14,10 @@ We don't care about building tests for now, and it makes the compilation much fa 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fdfe456a..00c122ba 100644 +index b2ab30e1..24127b09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -718,7 +718,8 @@ endif() +@@ -733,7 +733,8 @@ endif() include(Source/CMakeVersion.cmake) # Include the standard Dart testing module @@ -28,5 +28,5 @@ index fdfe456a..00c122ba 100644 # Set up test-time configuration. -- -2.34.1 +2.36.1 diff --git a/Ports/cmake/patches/ReadMe.md b/Ports/cmake/patches/ReadMe.md index bd25ea1c6d..e99af96aaa 100644 --- a/Ports/cmake/patches/ReadMe.md +++ b/Ports/cmake/patches/ReadMe.md @@ -37,7 +37,7 @@ This patch adds the SerenityOS platform config file to CMake. cmcurl: Include unistd -Everyone gets this wrong. most platforms are very lax with these includes, but we're not one of them. +Everyone gets this wrong. Most platforms are very lax with these includes, but we're not one of them. - [X] Local? - [ ] Should be merged to upstream? @@ -65,3 +65,4 @@ We don't care about building tests for now, and it makes the compilation much fa - [ ] Should be merged to upstream? - [ ] Resolves issue(s) with our side of things - [ ] Hack +