Merge branch 'cmake' into 'master'

Update and fix cmake

See merge request redox-os/redox!2124

config/x86_64/ci.toml

@@ -40,6 +40,7 @@ ca-certificates = {}
 cairo = {}
 cbindgen = {}
 cleye = {}
+cmake = {}
 composer = {}
 contain = {}
 coreutils = {}
@@ -90,6 +91,7 @@ ion = {}
 kernel = {}
 kibi = {}
 lci = {}
+libarchive = {}
 libavif = {}
 libc-bench = {}
 libedit = {}
@@ -236,7 +238,6 @@ zstd = {}
 #book = {}
 #cairo-demo = {} # linking errors
 #classicube = {}
-#cmake = {}
 #cmatrix = {} # needs ncursesw now
 #cookbook = {}
 #cosmic-reader = {}
@@ -265,7 +266,6 @@ zstd = {}
 #iced = {}
 #jansson = {} # needs config.sub update
 #jq = {}
-#libarchive = {}
 #libatomic = {}
 #libcosmic = {}
 #libflac = {}

recipes/dev/cmake/recipe.toml

@@ -1,10 +1,10 @@
 [source]
-tar = "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3.tar.gz"
+tar = "https://github.com/Kitware/CMake/releases/download/v4.3.2/cmake-4.3.2.tar.gz"
+blake3 = "cbd0121189df1502f61e8f12f044b4a901b1ea16c74c016b85714e4661b8537f"
 
 [build]
-template = "custom"
+template = "cmake"
 dependencies = [
-    "bzip2",
     # "cppdap",
     "curl",
     "expat",
@@ -14,30 +14,17 @@ dependencies = [
     # "liblzma",
     # "librhash",
     "libuv",
-    "nghttp2",
-    "openssl3",
     "zlib",
     "zstd",
 ]
-script = """
-DYNAMIC_INIT
-
-COOKBOOK_CMAKE_FLAGS+=(
-    -DBUILD_TESTING=Off
-    -DCMAKE_USE_SYSTEM_BZIP2=On
-    -DCMAKE_USE_SYSTEM_CURL=On
-    -DCMAKE_USE_SYSTEM_EXPAT=On
-    -DCMAKE_USE_SYSTEM_LIBARCHIVE=On
-    -DCMAKE_USE_SYSTEM_LIBUV=On
-    -DCMAKE_USE_SYSTEM_NGHTTP2=On
-    -DCMAKE_USE_SYSTEM_ZLIB=On
-    -DCMAKE_USE_SYSTEM_ZSTD=On
-)
-cookbook_cmake
-set -x
-mv -vT "${COOKBOOK_STAGE}"/usr/bin "${COOKBOOK_STAGE}/bin"
-mv -vT "${COOKBOOK_STAGE}"/usr/share "${COOKBOOK_STAGE}/share"
-rm -rf "${COOKBOOK_STAGE}"/usr/doc
-rmdir -v "${COOKBOOK_STAGE}"/usr
-set +x
-"""
+cmakeflags = [
+    "-DBUILD_TESTING=Off",
+    "-DCMAKE_USE_SYSTEM_BZIP2=On",
+    "-DCMAKE_USE_SYSTEM_CURL=On",
+    "-DCMAKE_USE_SYSTEM_EXPAT=On",
+    "-DCMAKE_USE_SYSTEM_LIBARCHIVE=On",
+    "-DCMAKE_USE_SYSTEM_LIBUV=On",
+    "-DCMAKE_USE_SYSTEM_NGHTTP2=On",
+    "-DCMAKE_USE_SYSTEM_ZLIB=On",
+    "-DCMAKE_USE_SYSTEM_ZSTD=On",
+]

recipes/groups/dev-essential/recipe.toml

@@ -1,6 +1,7 @@
 [package]
 dependencies = [
     "autotools",
+    "cmake",
     "gcc13",
     "gcc13.cxx",
     "gnu-binutils",