Skip to content

GH-43467: [C++] Add support for the official LZ4 CMake package #43468

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

Merged
assignUser merged 3 commits into from
Jul 31, 2024
Merged

GH-43467: [C++] Add support for the official LZ4 CMake package #43468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f3f175
GH-43467: [C++] Add support for the official LZ4 CMake package
kou Jul 29, 2024
90f2b4d
Add libxxhash-dev dependency explicitly
kou Jul 31, 2024
c2c28c8
Exclude libparquet.so
kou Jul 31, 2024
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
12 changes: 9 additions & 3 deletions cpp/cmake_modules/Findlz4Alt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,15 @@ endif()
find_package(lz4 ${find_package_args})
if(lz4_FOUND)
set(lz4Alt_FOUND TRUE)
# Conan uses lz4::lz4 not LZ4::lz4
if(NOT TARGET LZ4::lz4 AND TARGET lz4::lz4)
add_library(LZ4::lz4 ALIAS lz4::lz4)
if(NOT TARGET LZ4::lz4)
# Conan uses lz4::lz4 not LZ4::lz4
if(TARGET lz4::lz4)
add_library(LZ4::lz4 ALIAS lz4::lz4)
elseif(ARROW_LZ4_USE_SHARED)
add_library(LZ4::lz4 ALIAS LZ4::lz4_shared)
else()
add_library(LZ4::lz4 ALIAS LZ4::lz4_static)
endif()
endif()
return()
endif()
Expand Down
5 changes: 4 additions & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4510,9 +4510,12 @@ function(build_orc)
OFF
CACHE BOOL "" FORCE)
get_target_property(LZ4_INCLUDE_DIR LZ4::lz4 INTERFACE_INCLUDE_DIRECTORIES)
if(NOT LZ4_INCLUDE_DIR)
find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
endif()
get_filename_component(LZ4_ROOT "${LZ4_INCLUDE_DIR}" DIRECTORY)
set(LZ4_HOME
${LZ4_ROOT}
"${LZ4_ROOT}"
CACHE STRING "" FORCE)
set(LZ4_LIBRARY
LZ4::lz4
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ RUN \
libssl-dev \
libthrift-dev \
libutf8proc-dev \
libxxhash-dev \
libzstd-dev \
llvm-dev \
lsb-release \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/apt/debian-trixie/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ RUN \
libssl-dev \
libthrift-dev \
libutf8proc-dev \
libxxhash-dev \
libzstd-dev \
llvm-dev \
lsb-release \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ RUN \
libssl-dev \
libthrift-dev \
libutf8proc-dev \
libxxhash-dev \
libzstd-dev \
llvm-dev \
lsb-release \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ RUN \
libssl-dev \
libthrift-dev \
libutf8proc-dev \
libxxhash-dev \
libzstd-dev \
llvm-dev \
lsb-release \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/apt/ubuntu-noble/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ RUN \
libssl-dev \
libthrift-dev \
libutf8proc-dev \
libxxhash-dev \
libzstd-dev \
llvm-dev \
lsb-release \
Expand Down
2 changes: 2 additions & 0 deletions dev/tasks/linux-packages/apache-arrow/debian/control.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Build-Depends:
libssl-dev,
libthrift-dev,
libutf8proc-dev,
libxxhash-dev,
libzstd-dev,
meson,
ninja-build,
Expand Down Expand Up @@ -152,6 +153,7 @@ Depends:
libsnappy-dev,
libssl-dev,
libutf8proc-dev,
libxxhash-dev,
libzstd-dev,
nlohmann-json-dev | nlohmann-json3-dev,
@USE_SYSTEM_GRPC@ protobuf-compiler-grpc,
Expand Down
4 changes: 3 additions & 1 deletion dev/tasks/linux-packages/apache-arrow/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,10 @@ override_dh_auto_test:

# libarrow.so: avoid failing with "Unknown DWARF DW_OP_172"
# libgandiva.so: avoid failing with "Unknown DWARF DW_OP_255"
# libparquet.so: avoid failing with "Unknown DWARF DW_OP_4"
# See also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949296
override_dh_dwz:
dh_dwz \
--exclude=libarrow.so \
--exclude=libgandiva.so
--exclude=libgandiva.so \
--exclude=libparquet.so