Skip to content
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

Jump to bottom

GH-44347: [Packaging][C++] Enable Azure file system for deb/rpm #44348

Merged
merged 1 commit into from
Oct 10, 2024
+21 −0
Merged

GH-44347: [Packaging][C++] Enable Azure file system for deb/rpm #44348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions 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 @@ -14,6 +14,13 @@ BUILD_TYPE=release
dh $@ --with gir

override_dh_auto_configure:
code_name="$$(. /etc/os-release && \
echo $${VERSION_CODENAME})"; \
if [ "$${code_name}" = "focal" ]; then \
ARROW_AZURE=OFF; \
else \
ARROW_AZURE=ON; \
fi; \
if dpkg -l nvidia-cuda-toolkit > /dev/null 2>&1; then \
ARROW_CUDA=ON; \
else \
Expand All @@ -24,6 +31,7 @@ override_dh_auto_configure:
--builddirectory=cpp_build \
--buildsystem=cmake+ninja \
-- \
-DARROW_AZURE=$${ARROW_AZURE} \
-DARROW_BUILD_UTILITIES=ON \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/yum/almalinux-8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ RUN \
gobject-introspection-devel \
json-devel \
libarchive \
libxml2-devel \
libzstd-devel \
llvm-devel \
llvm-static \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/yum/almalinux-9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ RUN \
gobject-introspection-devel \
json-devel \
libarchive \
libxml2-devel \
libzstd-devel \
llvm-devel \
llvm-static \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN \
gobject-introspection-devel \
grpc-devel \
grpc-plugins \
libxml2-devel \
libzstd-devel \
llvm-devel \
lz4-devel \
Expand Down
7 changes: 7 additions & 0 deletions dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
%define gcc_package gcc
%endif

%define use_azure (%{_rhel} >= 8 || %{_amzn} >= 2023)
%define use_bundled_nlohmann_json (%{_rhel} == 8)
%define use_flight (%{_rhel} >= 8 || %{_amzn} >= 2023)
%define use_gandiva (%{_rhel} >= 8 || %{_amzn} >= 2023)
Expand Down Expand Up @@ -121,6 +122,9 @@ BuildRequires: grpc-plugins
%if %{use_gcs} && !%{use_bundled_nlohmann_json}
BuildRequires: json-devel
%endif
%if %{use_azure}
BuildRequires: libxml2-devel
%endif
BuildRequires: libzstd-devel
BuildRequires: lz4-devel %{lz4_requirement}
BuildRequires: ninja-build
Expand Down Expand Up @@ -161,6 +165,9 @@ Apache Arrow is a data processing library for analysis.
cpp_build_type=release
cd cpp
%arrow_cmake \
%if %{use_azure}
-DARROW_AZURE=ON \
%endif
-DARROW_BUILD_UTILITIES=ON \
-DARROW_CSV=ON \
-DARROW_DATASET=ON \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ RUN \
glog-devel \
gobject-introspection-devel \
json-devel \
libxml2-devel \
libzstd-devel \
lz4-devel \
ninja-build \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ RUN \
gobject-introspection-devel \
json-devel \
libarchive \
libxml2-devel \
libzstd-devel \
llvm-devel \
llvm-static \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/linux-packages/apache-arrow/yum/centos-9-stream/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ RUN \
gobject-introspection-devel \
json-devel \
libarchive \
libxml2-devel \
libzstd-devel \
llvm-devel \
lz4-devel \
Expand Down
Loading