build(deps): Migrate Boost and msgpack-cxx dependencies to task-based installation (fixes #1243); Drop required Boost version back to 1.81; Add missing ZStd CMake target links.

components/core/CMakeLists.txt

@@ -157,12 +157,18 @@ if(CLP_NEED_BOOST)
     if(CLP_USE_STATIC_LIBS)
         set(Boost_USE_STATIC_LIBS ON)
     endif()
-    find_package(Boost 1.89 REQUIRED iostreams program_options filesystem regex url)
-    if(Boost_FOUND)
-        message(STATUS "Found Boost ${Boost_VERSION}")
-    else()
-        message(FATAL_ERROR "Could not find ${CLP_LIBS_STRING} libraries for Boost")
-    endif()
+    find_package(
+        Boost
+        1.81...1.88
+        REQUIRED
+            filesystem
+            iostreams
+            program_options
+            regex
+            system
+            url
+    )
+    message(STATUS "Found Boost ${Boost_VERSION}")
 endif()
 
 if(CLP_NEED_CATCH2)
@@ -271,14 +277,10 @@ if(CLP_NEED_MONGOCXX)
     endif()
 endif()
 
-# Find and setup msgpack
+# Find and setup msgpack-cxx
 if(CLP_NEED_MSGPACKCXX)
     find_package(msgpack-cxx 7.0.0 REQUIRED)
-    if(msgpack-cxx_FOUND)
-        message(STATUS "Found msgpack-cxx ${msgpack-cxx_VERSION}")
-    else()
-        message(FATAL_ERROR "Could not find msgpack-cxx")
-    endif()
+    message(STATUS "Found msgpack-cxx ${msgpack-cxx_VERSION}")
 endif()
 
 find_package(Threads REQUIRED)
@@ -731,7 +733,11 @@ if(CLP_BUILD_TESTING)
     target_link_libraries(unitTest
             PRIVATE
             absl::flat_hash_map
-            Boost::filesystem Boost::iostreams Boost::program_options Boost::regex Boost::url
+            Boost::filesystem
+            Boost::iostreams
+            Boost::program_options
+            Boost::regex
+            Boost::url
             Catch2::Catch2WithMain
             ${CURL_LIBRARIES}
             clp_s::search::ast
@@ -745,6 +751,7 @@ if(CLP_BUILD_TESTING)
             LibLZMA::LibLZMA
             MariaDBClient::MariaDBClient
             ${MONGOCXX_TARGET}
+            msgpack-cxx
             nlohmann_json::nlohmann_json
             simdjson::simdjson
             spdlog::spdlog

components/core/src/clp/clg/CMakeLists.txt

@@ -144,6 +144,7 @@ if(CLP_BUILD_EXECUTABLES)
                 fmt::fmt
                 log_surgeon::log_surgeon
                 MariaDBClient::MariaDBClient
+                msgpack-cxx
                 nlohmann_json::nlohmann_json
                 spdlog::spdlog
                 ${sqlite_LIBRARY_DEPENDENCIES}

components/core/src/clp/clp/CMakeLists.txt

@@ -185,6 +185,7 @@ if(CLP_BUILD_EXECUTABLES)
                 ${sqlite_LIBRARY_DEPENDENCIES}
                 LibArchive::LibArchive
                 MariaDBClient::MariaDBClient
+                msgpack-cxx
                 nlohmann_json::nlohmann_json
                 ${STD_FS_LIBS}
                 clp::string_utils

components/core/src/clp_s/CMakeLists.txt

@@ -18,7 +18,7 @@ set(
         ../clp/cli_utils.hpp
         ../clp/Defs.h
         ../clp/EncodedVariableInterpreter.cpp
-        ../clp/EncodedVariableInterpreter.hpp    
+        ../clp/EncodedVariableInterpreter.hpp
         ../clp/ErrorCode.hpp
         ../clp/ffi/encoding_methods.cpp
         ../clp/ffi/encoding_methods.hpp
@@ -69,15 +69,15 @@ set(
         ../clp/ir/parsing.inc
         ../clp/ir/types.hpp
         ../clp/LogSurgeonReader.cpp
-        ../clp/LogSurgeonReader.hpp    
+        ../clp/LogSurgeonReader.hpp
         ../clp/NetworkReader.cpp
         ../clp/NetworkReader.hpp
         ../clp/networking/socket_utils.cpp
         ../clp/networking/socket_utils.hpp
         ../clp/Query.cpp
         ../clp/Query.hpp
         ../clp/QueryToken.cpp
-        ../clp/QueryToken.hpp    
+        ../clp/QueryToken.hpp
         ../clp/ReaderInterface.cpp
         ../clp/ReaderInterface.hpp
         ../clp/ReadOnlyMemoryMappedFile.cpp
@@ -115,6 +115,7 @@ if(CLP_BUILD_CLP_S_CLP_DEPENDENCIES)
                 clp::string_utils
                 log_surgeon::log_surgeon
                 ystdlib::containers
+                ${zstd_TARGET}
                 PRIVATE
                 Boost::regex
                 ${CURL_LIBRARIES}
@@ -124,7 +125,6 @@ if(CLP_BUILD_CLP_S_CLP_DEPENDENCIES)
                 OpenSSL::Crypto
                 spdlog::spdlog
                 ystdlib::error_handling
-                ${zstd_TARGET}
         )
 endif()
 
@@ -358,6 +358,7 @@ if(CLP_BUILD_CLP_S_JSONCONSTRUCTOR)
                 fmt::fmt
                 ${MONGOCXX_TARGET}
                 spdlog::spdlog
+                ${zstd_TARGET}
         )
 endif()
 

components/core/src/clp_s/indexer/CMakeLists.txt

@@ -15,7 +15,7 @@ set(
         ../../clp/database_utils.hpp
         ../../clp/Defs.h
         ../../clp/EncodedVariableInterpreter.cpp
-        ../../clp/EncodedVariableInterpreter.hpp 
+        ../../clp/EncodedVariableInterpreter.hpp
         ../../clp/ErrorCode.hpp
         ../../clp/ffi/encoding_methods.cpp
         ../../clp/ffi/encoding_methods.hpp
@@ -118,6 +118,7 @@ if(CLP_BUILD_EXECUTABLES)
                 clp::string_utils
                 date::date
                 MariaDBClient::MariaDBClient
+                msgpack-cxx
                 nlohmann_json::nlohmann_json
                 OpenSSL::Crypto
                 simdjson::simdjson

components/core/src/reducer/CMakeLists.txt

@@ -44,6 +44,7 @@ if(CLP_BUILD_EXECUTABLES)
         target_link_libraries(reducer-server
                 PRIVATE
                 Boost::program_options
+                Boost::system
                 clp::string_utils
                 fmt::fmt
                 ${MONGOCXX_TARGET}

components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh

@@ -9,8 +9,4 @@ set -u
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 lib_install_scripts_dir="${script_dir}/.."
 
-# NOTE: The remaining installation scripts depend on boost, so we install it beforehand.
-"${lib_install_scripts_dir}/install-boost.sh" 1.89.0
-
 "${lib_install_scripts_dir}/liblzma.sh" 5.8.1
-"${lib_install_scripts_dir}/msgpack.sh" 7.0.0

components/core/tools/scripts/lib_install/macos/install-all.sh

@@ -27,15 +27,13 @@ if ! command -v uv ; then
 fi
 
 brew install \
-  boost \
   coreutils \
   gcc \
   java11 \
   libarchive \
   llvm@16 \
   lz4 \
   mariadb-connector-c \
-  msgpack-cxx \
   xz \
   zstd
 

components/core/tools/scripts/lib_install/manylinux_2_28/install-packages-from-source.sh

@@ -6,9 +6,6 @@ set -o pipefail
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 lib_install_scripts_dir="${script_dir}/.."
 
-# NOTE: The remaining installation scripts depend on boost, so we install it beforehand.
-"${lib_install_scripts_dir}/install-boost.sh" 1.89.0
-
 # NOTE:
 # 1. libarchive may statically link with LZMA, LZ4, and Zstandard, so we install them beforehand.
 # 2. The versions of libarchive, LZMA, LZ4, and Zstandard available in manylinux_2_28's package
@@ -18,5 +15,3 @@ lib_install_scripts_dir="${script_dir}/.."
 "${lib_install_scripts_dir}/lz4.sh" 1.10.0
 "${lib_install_scripts_dir}/zstandard.sh" 1.5.7
 "${lib_install_scripts_dir}/libarchive.sh" 3.8.0
-
-"${lib_install_scripts_dir}/msgpack.sh" 7.0.0

components/core/tools/scripts/lib_install/musllinux_1_2/install-packages-from-source.sh

@@ -6,9 +6,6 @@ set -o pipefail
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 lib_install_scripts_dir="${script_dir}/.."
 
-# NOTE: The remaining installation scripts depend on boost, so we install it beforehand.
-"${lib_install_scripts_dir}/install-boost.sh" 1.89.0
-
 # NOTE:
 # 1. libarchive may statically link with LZMA, LZ4, and Zstandard, so we install them beforehand.
 # 2. The versions of libarchive, LZMA, LZ4, and Zstandard available in musllinux_1_2's package
@@ -18,5 +15,3 @@ lib_install_scripts_dir="${script_dir}/.."
 "${lib_install_scripts_dir}/lz4.sh" 1.10.0
 "${lib_install_scripts_dir}/zstandard.sh" 1.5.7
 "${lib_install_scripts_dir}/libarchive.sh" 3.8.0
-
-"${lib_install_scripts_dir}/msgpack.sh" 7.0.0

components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh

@@ -9,11 +9,7 @@ set -u
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 lib_install_scripts_dir=$script_dir/..
 
-# NOTE: boost must be installed first since the remaining packages depend on it
-"$lib_install_scripts_dir"/install-boost.sh 1.89.0
-
 "$lib_install_scripts_dir"/libarchive.sh 3.5.1
 "$lib_install_scripts_dir"/liblzma.sh 5.8.1
 "$lib_install_scripts_dir"/lz4.sh 1.10.0
-"$lib_install_scripts_dir"/msgpack.sh 7.0.0
 "$lib_install_scripts_dir"/zstandard.sh 1.5.7

taskfiles/deps/main.yaml

@@ -18,6 +18,7 @@ vars:
   G_DEPS_CORE_CMAKE_SETTINGS_DIR: "{{.G_DEPS_CORE_DIR}}/cmake-settings"
 
   # Library names
+  G_BOOST_LIB_NAME: "Boost"
   G_FMT_LIB_NAME: "fmt"
   G_GSL_LIB_NAME: "Microsoft.GSL"
 
@@ -63,6 +64,7 @@ tasks:
       - task: "absl"
       - task: "antlr-jar"
       - task: "antlr-runtime"
+      - task: "boost"
       - task: "catch2"
       - task: "date"
       - task: "fmt"
@@ -71,6 +73,7 @@ tasks:
       - task: "lz4"
       - task: "microsoft.gsl"
       - task: "mongocxx"
+      - task: "msgpack-cxx"
       - task: "nlohmann_json"
       - task: "simdjson"
       - task: "spdlog"
@@ -181,6 +184,27 @@ tasks:
           CHECKSUM_FILE: "{{.CHECKSUM_FILE}}"
           INCLUDE_PATTERNS: ["{{.INSTALL_PREFIX}}"]
 
+  boost:
+    internal: true
+    vars:
+      VERSION: "1.87.0"
+    run: "once"
+    cmds:
+      - task: "yscope-dev-utils:boost:download-and-install"
+        vars:
+          CMAKE_SETTINGS_DIR: "{{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}"
+          FILE_SHA256: "d6c69e4459eb5d6ec208250291221e7ff4a2affde9af6e49c9303b89c687461f"
+          TARGETS:
+            - "filesystem"
+            - "iostreams"
+            - "program_options"
+            - "regex"
+            - "system"
+            - "url"
+          URL: "https://github.com/boostorg/boost/releases/download/boost-{{.VERSION}}/\
+          boost-{{.VERSION}}-b2-nodocs.tar.gz"
+          WORK_DIR: "{{.G_DEPS_CORE_DIR}}"
+
   catch2:
     internal: true
     run: "once"
@@ -343,6 +367,30 @@ tasks:
           TARBALL_URL: "https://github.com/mongodb/mongo-cxx-driver/releases/download/{{.VERSION}}\
           /mongo-cxx-driver-{{.VERSION}}.tar.gz"
 
+  msgpack-cxx:
+    internal: true
+    vars:
+      VERSION: "7.0.0"
+    run: "once"
+    deps:
+      - task: "boost"
+    cmds:
+      - task: "utils:install-remote-cmake-lib"
+        vars:
+          CMAKE_GEN_ARGS:
+            - "-C {{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}/{{.G_BOOST_LIB_NAME}}.cmake"
+            - "-DCMAKE_POLICY_DEFAULT_CMP0074=NEW"
+            - "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
+            - "-DMSGPACK_BUILD_DOCS=OFF"
+            - "-DMSGPACK_BUILD_EXAMPLES=OFF"
+            - "-DMSGPACK_BUILD_TESTS=OFF"
+            - "-DMSGPACK_CXX20=ON"
+            - "-DMSGPACK_USE_BOOST=ON"
+          LIB_NAME: "msgpack-cxx"
+          TARBALL_SHA256: "7504b7af7e7b9002ce529d4f941e1b7fb1fb435768780ce7da4abaac79bb156f"
+          TARBALL_URL: "https://github.com/msgpack/msgpack-c/releases/download/cpp-{{.VERSION}}\
+          /msgpack-cxx-{{.VERSION}}.tar.gz"
+
   nlohmann_json:
     internal: true
     run: "once"