Skip to content

build(deps): Migrate LibArchive dependency to task-based installation: #1122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open

build(deps): Migrate LibArchive dependency to task-based installation: #1122

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
280ba24
Remove current libarchive installations from all os platforms
Bill-hbrhbr Jul 22, 2025
0f97d9b
Use task to install a fixed version of libarchive
Bill-hbrhbr Jul 22, 2025
0f686fd
Revert LibArchive static linking module
Bill-hbrhbr Jul 22, 2025
88f1eed
Add missing target links to make ubuntu-jammy compile
Bill-hbrhbr Jul 22, 2025
2cacc5d
Fix library name
Bill-hbrhbr Jul 22, 2025
2597a21
Misc fixes
Bill-hbrhbr Jul 22, 2025
3a53973
Add missing deps (bzip2)
Bill-hbrhbr Jul 23, 2025
3ff8669
Add missing bzip2 for manylinux
Bill-hbrhbr Jul 23, 2025
8a2407b
Address coderabbit ai review
Bill-hbrhbr Jul 23, 2025
3233f2f
Replace broken LibLZMA target with old-fashioned LZMA libraries variable
Bill-hbrhbr Jul 23, 2025
f61890b
Optimize package find logging statement
Bill-hbrhbr Jul 23, 2025
e78c035
Use existing helper to find dep modules for libarchive
Bill-hbrhbr Jul 23, 2025
5fdbc12
Make Pkgconf work in FindLibArchive
Bill-hbrhbr Jul 24, 2025
cb47228
restore cmakelists order to reduce clutter
Bill-hbrhbr Jul 24, 2025
8f5d04d
Remove centos restriction on avoiding static libs
Bill-hbrhbr Jul 24, 2025
5046d0d
Improve LibArchive find module
Bill-hbrhbr Aug 13, 2025
e65b433
Revert changes to find library deps
Bill-hbrhbr Aug 13, 2025
d54a1ea
Remove unnecessary find_package calls
Bill-hbrhbr Aug 13, 2025
2bb246b
Revert many/musllinux dep scripts and update ubuntujammy/centos/macos…
Bill-hbrhbr Aug 13, 2025
515e400
Merge branch 'main' into modernize-libarchive-install
Bill-hbrhbr Aug 13, 2025
a21c9ce
revert libarchive script
Bill-hbrhbr Aug 13, 2025
c6e03c0
Merge branch 'main' into modernize-libarchive-install
Bill-hbrhbr Sep 18, 2025
bc61453
Merge branch 'main' into modernize-libarchive-install
Bill-hbrhbr Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 39 additions & 10 deletions components/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,13 @@ if(CLP_NEED_BOOST)
endif()
endif()

if(CLP_NEED_BZIP2)
find_package(BZip2 REQUIRED)
if (BZip2_FOUND)
message(STATUS "Found BZip2")
endif()
endif()

if(CLP_NEED_CATCH2)
find_package(Catch2 REQUIRED)
if (Catch2_FOUND)
Expand Down Expand Up @@ -183,6 +190,16 @@ if(CLP_NEED_LOG_SURGEON)
endif()
endif()

if(CLP_NEED_LZ4)
if(CLP_USE_STATIC_LIBS)
set(LZ4_USE_STATIC_LIBS ON)
endif()
find_package(LZ4 REQUIRED)
if (LZ4_FOUND)
message(STATUS "Found LZ4 ${LZ4_VERSION}")
endif()
endif()

if(CLP_NEED_NLOHMANN_JSON)
find_package(nlohmann_json REQUIRED)
if(nlohmann_json_FOUND)
Expand All @@ -209,7 +226,7 @@ if(CLP_NEED_LIBARCHIVE)
if(CLP_USE_STATIC_LIBS)
set(LibArchive_USE_STATIC_LIBS ON)
endif()
find_package(LibArchive REQUIRED)
find_package(LibArchive 3.8.1 REQUIRED)
if(LibArchive_FOUND)
message(STATUS "Found LibArchive ${LibArchive_VERSION}")
else()
Expand Down Expand Up @@ -288,6 +305,16 @@ if(CLP_NEED_YSTDLIB)
add_subdirectory("${CLP_YSTDLIB_SOURCE_DIRECTORY}" "${CMAKE_BINARY_DIR}/ystdlib" EXCLUDE_FROM_ALL)
endif()

# Find and setup ZLIB
if(CLP_NEED_ZLIB)
find_package(ZLIB REQUIRED)
if(ZLIB_FOUND)
message(STATUS "Found ZLIB ${ZLIB_VERSION_STRING}")
else()
message(FATAL_ERROR "Could not find ${CLP_LIBS_STRING} libraries for ZLIB")
endif()
endif()

# Find and setup ZStd Library
if(CLP_NEED_ZSTD)
if(CLP_USE_STATIC_LIBS)
Expand Down Expand Up @@ -743,32 +770,34 @@ if(CLP_BUILD_TESTING)
)
target_link_libraries(unitTest
PRIVATE
${CURL_LIBRARIES}
${LIBLZMA_LIBRARIES}
${MONGOCXX_TARGET}
${sqlite_LIBRARY_DEPENDENCIES}
${STD_FS_LIBS}
absl::flat_hash_map
Boost::filesystem Boost::iostreams Boost::program_options Boost::regex Boost::url
Catch2::Catch2
${CURL_LIBRARIES}
clp::regex_utils
clp::string_utils
clp_s::search::ast
clp_s::search::kql
clp_s::search::sql
clp_s::timestamp_pattern
date::date
fmt::fmt
log_surgeon::log_surgeon
LibArchive::LibArchive
LibLZMA::LibLZMA
LZ4::LZ4
log_surgeon::log_surgeon
MariaDBClient::MariaDBClient
${MONGOCXX_TARGET}
nlohmann_json::nlohmann_json
OpenSSL::Crypto
simdjson::simdjson
spdlog::spdlog
OpenSSL::Crypto
${sqlite_LIBRARY_DEPENDENCIES}
${STD_FS_LIBS}
clp::regex_utils
clp::string_utils
yaml-cpp
ystdlib::containers
ystdlib::error_handling
${LIBLZMA_LIBRARIES}
ZStd::ZStd
)
target_compile_features(unitTest
Expand Down
9 changes: 9 additions & 0 deletions components/core/cmake/Options/options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,14 @@ function(set_clp_binaries_dependencies)
set_clp_need_flags(
CLP_NEED_ABSL
CLP_NEED_BOOST
CLP_NEED_BZIP2
CLP_NEED_CURL
CLP_NEED_DATE
CLP_NEED_FMT
CLP_NEED_LIBARCHIVE
CLP_NEED_LOG_SURGEON
CLP_NEED_LZ4
CLP_NEED_LZMA
CLP_NEED_MARIADB
CLP_NEED_MONGOCXX
CLP_NEED_MSGPACKCXX
Expand All @@ -148,6 +151,7 @@ function(set_clp_binaries_dependencies)
CLP_NEED_SQLITE
CLP_NEED_YAMLCPP
CLP_NEED_YSTDLIB
CLP_NEED_ZLIB
CLP_NEED_ZSTD
)
endfunction()
Expand All @@ -167,11 +171,13 @@ function(set_clp_tests_dependencies)
set_clp_need_flags(
CLP_NEED_ABSL
CLP_NEED_BOOST
CLP_NEED_BZIP2
CLP_NEED_CATCH2
CLP_NEED_DATE
CLP_NEED_FMT
CLP_NEED_LIBARCHIVE
CLP_NEED_LOG_SURGEON
CLP_NEED_LZ4
CLP_NEED_LZMA
CLP_NEED_MARIADB
CLP_NEED_MONGOCXX
Expand Down Expand Up @@ -450,12 +456,14 @@ function (convert_clp_dependency_properties_to_variables)
CLP_NEED_ABSL
CLP_NEED_ANTLR
CLP_NEED_BOOST
CLP_NEED_BZIP2
CLP_NEED_CATCH2
CLP_NEED_CURL
CLP_NEED_DATE
CLP_NEED_FMT
CLP_NEED_LOG_SURGEON
CLP_NEED_LIBARCHIVE
CLP_NEED_LZ4
CLP_NEED_LZMA
CLP_NEED_MARIADB
CLP_NEED_MONGOCXX
Expand All @@ -467,6 +475,7 @@ function (convert_clp_dependency_properties_to_variables)
CLP_NEED_SQLITE
CLP_NEED_YAMLCPP
CLP_NEED_YSTDLIB
CLP_NEED_ZLIB
CLP_NEED_ZSTD
)

Expand Down
14 changes: 9 additions & 5 deletions components/core/src/clp/clp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,20 +174,24 @@ if(CLP_BUILD_EXECUTABLES)
)
target_link_libraries(clp
PRIVATE
${sqlite_LIBRARY_DEPENDENCIES}
${STD_FS_LIBS}
Boost::filesystem Boost::program_options
clp::string_utils
date::date
fmt::fmt
log_surgeon::log_surgeon
spdlog::spdlog
${sqlite_LIBRARY_DEPENDENCIES}
LibArchive::LibArchive
${BZIP2_LIBRARIES}
LibLZMA::LibLZMA
log_surgeon::log_surgeon
LZ4::LZ4
MariaDBClient::MariaDBClient
nlohmann_json::nlohmann_json
${STD_FS_LIBS}
clp::string_utils
spdlog::spdlog
yaml-cpp
ystdlib::containers
ystdlib::error_handling
ZLIB::ZLIB
ZStd::ZStd
)
# Put the built executable at the root of the build directory
Expand Down
10 changes: 6 additions & 4 deletions components/core/src/glt/glt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,16 +180,18 @@ if(CLP_BUILD_EXECUTABLES)
)
target_link_libraries(glt
PRIVATE
${sqlite_LIBRARY_DEPENDENCIES}
${STD_FS_LIBS}
Boost::filesystem Boost::iostreams Boost::program_options
clp::string_utils
date::date
fmt::fmt
spdlog::spdlog
${sqlite_LIBRARY_DEPENDENCIES}
LibArchive::LibArchive
LibLZMA::LibLZMA
LZ4::LZ4
MariaDBClient::MariaDBClient
nlohmann_json::nlohmann_json
${STD_FS_LIBS}
clp::string_utils
spdlog::spdlog
yaml-cpp
ystdlib::error_handling
ZStd::ZStd
Expand Down
4 changes: 3 additions & 1 deletion components/core/tools/scripts/lib_install/centos-stream-9/install-prebuilt-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,20 @@ set -e
set -u

dnf install -y \
bzip2-devel \
cmake \
diffutils \
gcc-c++ \
git \
java-11-openjdk \
jq \
libarchive-devel \
libcurl-devel \
libzstd-devel \
lz4-devel \
make \
mariadb-connector-c-devel \
openssl-devel \
python3-devel \
python3-pip \
unzip

Expand Down
95 changes: 0 additions & 95 deletions components/core/tools/scripts/lib_install/libarchive.sh
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion components/core/tools/scripts/lib_install/macos/install-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ brew install \
coreutils \
gcc \
java11 \
libarchive \
llvm@16 \
lz4 \
mariadb-connector-c \
Expand Down
1 change: 0 additions & 1 deletion components/core/tools/scripts/lib_install/manylinux_2_28/install-packages-from-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ lib_install_scripts_dir="${script_dir}/.."
"${lib_install_scripts_dir}/liblzma.sh" 5.8.1
"${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
1 change: 1 addition & 0 deletions components/core/tools/scripts/lib_install/manylinux_2_28/install-prebuilt-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -eu
set -o pipefail

dnf install -y \
bzip2-devel \
gcc-c++ \
java-11-openjdk \
jq \
Expand Down
1 change: 0 additions & 1 deletion components/core/tools/scripts/lib_install/musllinux_1_2/install-packages-from-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ lib_install_scripts_dir="${script_dir}/.."
"${lib_install_scripts_dir}/liblzma.sh" 5.8.1
"${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
1 change: 0 additions & 1 deletion components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ 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.87.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.8.2
"$lib_install_scripts_dir"/msgpack.sh 7.0.0
Expand Down
2 changes: 2 additions & 0 deletions components/core/tools/scripts/lib_install/ubuntu-jammy/install-prebuilt-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ set -u

apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
libbz2-dev \
ca-certificates \
checkinstall \
cmake \
Expand All @@ -23,6 +24,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
openjdk-11-jdk \
pkg-config \
python3 \
python3-dev \
python3-pip \
python3-venv \
software-properties-common \
Expand Down
Loading
Loading