From 96e93ee4a5904ba9c63bb88c81622518c9441807 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 07:19:17 -0400 Subject: [PATCH 1/6] add zlib taskfile --- taskfiles/deps/main.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml index bbd75a46eb..04b4c8a615 100644 --- a/taskfiles/deps/main.yaml +++ b/taskfiles/deps/main.yaml @@ -77,6 +77,7 @@ tasks: - task: "utfcpp" - task: "yaml-cpp" - task: "ystdlib" + - task: "zlib" - task: "zstd" absl: @@ -433,6 +434,26 @@ tasks: CLP_YSTDLIB_SOURCE_DIRECTORY \"{{.YSTDLIB_OUTPUT_DIR}}\" )" > "{{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}/{{.LIB_NAME}}.cmake" + zlib: + run: "once" + cmds: + - task: "utils:install-remote-cmake-lib" + vars: + CMAKE_GEN_ARGS: + - "-DCMAKE_BUILD_TYPE=Release" + - "-DCMAKE_INSTALL_MESSAGE=LAZY" + - "-DZLIB_BUILD_SHARED=ON" + - "-DZLIB_BUILD_STATIC=ON" + - "-DZLIB_BUILD_TESTING=OFF" + - "-DZLIB_BUILD_EXAMPLES=OFF" + - "-DZLIB_BUILD_MINIZIP=OFF" + - "-DZLIB_INSTALL=ON" + - "-DCMAKE_INSTALL_LIBDIR=lib" + - "-DCMAKE_INSTALL_PREFIX={{.G_DEPS_CORE_DIR}}/zlib-install" + LIB_NAME: "zlib" + TARBALL_SHA256: "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23" + TARBALL_URL: "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz" + zstd: internal: true run: "once" From 020151c48a27e460ea834a3e5c95fa8701e31597 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Mon, 18 Aug 2025 16:21:10 -0400 Subject: [PATCH 2/6] Alphabetcize --- taskfiles/deps/main.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml index 04b4c8a615..d01e83452d 100644 --- a/taskfiles/deps/main.yaml +++ b/taskfiles/deps/main.yaml @@ -435,6 +435,9 @@ tasks: )" > "{{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}/{{.LIB_NAME}}.cmake" zlib: + internal: true + vars: + LIB_NAME: "zlib" run: "once" cmds: - task: "utils:install-remote-cmake-lib" @@ -442,15 +445,14 @@ tasks: CMAKE_GEN_ARGS: - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_INSTALL_MESSAGE=LAZY" + - "-DCMAKE_INSTALL_PREFIX={{.G_DEPS_CORE_DIR}}/{{.LIB_NAME}}-install" + - "-DZLIB_BUILD_EXAMPLES=OFF" + - "-DZLIB_BUILD_MINIZIP=OFF" - "-DZLIB_BUILD_SHARED=ON" - "-DZLIB_BUILD_STATIC=ON" - "-DZLIB_BUILD_TESTING=OFF" - - "-DZLIB_BUILD_EXAMPLES=OFF" - - "-DZLIB_BUILD_MINIZIP=OFF" - "-DZLIB_INSTALL=ON" - - "-DCMAKE_INSTALL_LIBDIR=lib" - - "-DCMAKE_INSTALL_PREFIX={{.G_DEPS_CORE_DIR}}/zlib-install" - LIB_NAME: "zlib" + LIB_NAME: "{{.LIB_NAME}}" TARBALL_SHA256: "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23" TARBALL_URL: "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz" From 4bb18da5b9aa8b2cbbb32e74c778adc958200ad3 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Tue, 19 Aug 2025 03:09:04 -0400 Subject: [PATCH 3/6] Remove unnecessary cmake options --- taskfiles/deps/main.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml index 311aedbb2f..943ba66523 100644 --- a/taskfiles/deps/main.yaml +++ b/taskfiles/deps/main.yaml @@ -484,7 +484,6 @@ tasks: )" > "{{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}/{{.LIB_NAME}}.cmake" zlib: - internal: true vars: LIB_NAME: "zlib" run: "once" @@ -492,15 +491,10 @@ tasks: - task: "utils:install-remote-cmake-lib" vars: CMAKE_GEN_ARGS: + - "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_BUILD_TYPE=Release" - - "-DCMAKE_INSTALL_MESSAGE=LAZY" - "-DCMAKE_INSTALL_PREFIX={{.G_DEPS_CORE_DIR}}/{{.LIB_NAME}}-install" - "-DZLIB_BUILD_EXAMPLES=OFF" - - "-DZLIB_BUILD_MINIZIP=OFF" - - "-DZLIB_BUILD_SHARED=ON" - - "-DZLIB_BUILD_STATIC=ON" - - "-DZLIB_BUILD_TESTING=OFF" - - "-DZLIB_INSTALL=ON" LIB_NAME: "{{.LIB_NAME}}" TARBALL_SHA256: "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23" TARBALL_URL: "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz" From 1e4d6267d165c871053b5dfb5cb57db12f33de2b Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Tue, 19 Aug 2025 06:08:44 -0400 Subject: [PATCH 4/6] Add back cmake lazy install message --- taskfiles/deps/main.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml index e320ae97d6..2a7e56f583 100644 --- a/taskfiles/deps/main.yaml +++ b/taskfiles/deps/main.yaml @@ -495,6 +495,7 @@ tasks: CMAKE_GEN_ARGS: - "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_BUILD_TYPE=Release" + - "-DCMAKE_INSTALL_MESSAGE=LAZY" - "-DCMAKE_INSTALL_PREFIX={{.G_DEPS_CORE_DIR}}/{{.LIB_NAME}}-install" - "-DZLIB_BUILD_EXAMPLES=OFF" LIB_NAME: "{{.LIB_NAME}}" From e0fb139c8efd8d790c21ef988634657cc421c26f Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Tue, 19 Aug 2025 10:15:26 +0000 Subject: [PATCH 5/6] Update docs --- docs/src/dev-guide/components-core/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/src/dev-guide/components-core/index.md b/docs/src/dev-guide/components-core/index.md index 6fc4b78f98..a8d36d8c87 100644 --- a/docs/src/dev-guide/components-core/index.md +++ b/docs/src/dev-guide/components-core/index.md @@ -42,6 +42,7 @@ The task will download, build, and install (within the build directory) the foll | [fmt](https://github.com/fmtlib/fmt) | v10.2.1 | | [json](https://github.com/nlohmann/json.git) | v3.11.3 | | [log-surgeon](https://github.com/y-scope/log-surgeon) | f801a3f | +| [liblzma](https://github.com/tukaani-project/xz) | v5.8.1 | | [lz4](https://github.com/lz4/lz4) | v1.10.0 | | [mongo-cxx-driver](https://github.com/mongodb/mongo-cxx-driver) | r3.10.2 | | [simdjson](https://github.com/simdjson/simdjson) | v3.13.0 | @@ -51,6 +52,7 @@ The task will download, build, and install (within the build directory) the foll | [yaml-cpp](https://github.com/jbeder/yaml-cpp.git) | v0.7.0 | | [yscope-log-viewer](https://github.com/y-scope/yscope-log-viewer.git) | 969ff35 | | [ystdlib-cpp](https://github.com/y-scope/ystdlib-cpp.git) | d80cf86 | +| [zlib](https://github.com/madler/zlib) | v1.3.1 | | [zstd](https://github.com/facebook/zstd) | v1.5.7 | ### Environment From f6e5276a39b8dcb76832b003b1ed6a76f4255ab5 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Tue, 19 Aug 2025 18:20:52 +0800 Subject: [PATCH 6/6] Update taskfiles/deps/main.yaml --- taskfiles/deps/main.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml index 2a7e56f583..ec97e1e273 100644 --- a/taskfiles/deps/main.yaml +++ b/taskfiles/deps/main.yaml @@ -486,6 +486,7 @@ tasks: )" > "{{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}/{{.LIB_NAME}}.cmake" zlib: + internal: true vars: LIB_NAME: "zlib" run: "once"