Merge branch 'fix-cmake' into 'master'

Fix and update cmake

See merge request redox-os/cookbook!557
This commit is contained in:
Jeremy Soller 2025-07-21 13:48:10 -06:00
commit 974b6807c7

View File

@ -1,23 +1,45 @@
[source]
tar = "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2.tar.gz"
tar = "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3.tar.gz"
[build]
template = "custom"
dependencies = [
"bzip2",
# "cppdap",
"curl",
"expat",
# "form",
# "jsoncpp",
"libarchive",
# "liblzma",
# "librhash",
"libuv",
"nghttp2",
"openssl1",
"zlib",
"zstd",
]
script = """
COOKBOOK_CONFIGURE="cmake"
COOKBOOK_CONFIGURE_FLAGS=(
-DCMAKE_VERBOSE_MAKEFILE=On
-DCMAKE_CROSSCOMPILING=True
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX="/"
"${COOKBOOK_SOURCE}"
DYNAMIC_INIT
export LDFLAGS="-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib $LDFLAGS"
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
cookbook_configure
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
"""