From c078f04fe7132e785b2e51d97131058737901e85 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 9 Oct 2024 17:02:29 +0900 Subject: [PATCH] GH-44347: [Packaging][C++] Enable Azure file system for deb/rpm --- dev/tasks/linux-packages/apache-arrow/debian/rules | 8 ++++++++ .../apache-arrow/yum/almalinux-8/Dockerfile | 1 + .../apache-arrow/yum/almalinux-9/Dockerfile | 1 + .../apache-arrow/yum/amazon-linux-2023/Dockerfile | 1 + dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in | 2 ++ .../linux-packages/apache-arrow/yum/centos-7/Dockerfile | 1 + .../apache-arrow/yum/centos-8-stream/Dockerfile | 1 + .../apache-arrow/yum/centos-9-stream/Dockerfile | 1 + 8 files changed, 16 insertions(+) diff --git a/dev/tasks/linux-packages/apache-arrow/debian/rules b/dev/tasks/linux-packages/apache-arrow/debian/rules index 40877f44dbe66..5bc70601fb0f8 100755 --- a/dev/tasks/linux-packages/apache-arrow/debian/rules +++ b/dev/tasks/linux-packages/apache-arrow/debian/rules @@ -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 \ @@ -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 \ diff --git a/dev/tasks/linux-packages/apache-arrow/yum/almalinux-8/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/almalinux-8/Dockerfile index d846915ab21de..6fefd0fe392d0 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/almalinux-8/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/yum/almalinux-8/Dockerfile @@ -41,6 +41,7 @@ RUN \ gobject-introspection-devel \ json-devel \ libarchive \ + libxml2-devel \ libzstd-devel \ llvm-devel \ llvm-static \ diff --git a/dev/tasks/linux-packages/apache-arrow/yum/almalinux-9/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/almalinux-9/Dockerfile index 222ab1b58d34d..45b86dcdfaa72 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/almalinux-9/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/yum/almalinux-9/Dockerfile @@ -43,6 +43,7 @@ RUN \ gobject-introspection-devel \ json-devel \ libarchive \ + libxml2-devel \ libzstd-devel \ llvm-devel \ llvm-static \ diff --git a/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile index 7f0f3e90a363a..a19641f8f961d 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile @@ -38,6 +38,7 @@ RUN \ gobject-introspection-devel \ grpc-devel \ grpc-plugins \ + libxml2-devel \ libzstd-devel \ llvm-devel \ lz4-devel \ diff --git a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in index f588bb3f1ab5a..85fe557a2c5cc 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in +++ b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in @@ -121,6 +121,7 @@ BuildRequires: grpc-plugins %if %{use_gcs} && !%{use_bundled_nlohmann_json} BuildRequires: json-devel %endif +BuildRequires: libxml2-devel BuildRequires: libzstd-devel BuildRequires: lz4-devel %{lz4_requirement} BuildRequires: ninja-build @@ -161,6 +162,7 @@ Apache Arrow is a data processing library for analysis. cpp_build_type=release cd cpp %arrow_cmake \ + -DARROW_AZURE=ON \ -DARROW_BUILD_UTILITIES=ON \ -DARROW_CSV=ON \ -DARROW_DATASET=ON \ diff --git a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile index e834e17a4bb30..b10c40937d32a 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile @@ -58,6 +58,7 @@ RUN \ glog-devel \ gobject-introspection-devel \ json-devel \ + libxml2-devel \ libzstd-devel \ lz4-devel \ ninja-build \ diff --git a/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile index ce0a26a0e46bb..2730fd58ccd0b 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile @@ -49,6 +49,7 @@ RUN \ gobject-introspection-devel \ json-devel \ libarchive \ + libxml2-devel \ libzstd-devel \ llvm-devel \ llvm-static \ diff --git a/dev/tasks/linux-packages/apache-arrow/yum/centos-9-stream/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/centos-9-stream/Dockerfile index 9522d999af5b7..d436ed6a94747 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/centos-9-stream/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-9-stream/Dockerfile @@ -40,6 +40,7 @@ RUN \ gobject-introspection-devel \ json-devel \ libarchive \ + libxml2-devel \ libzstd-devel \ llvm-devel \ lz4-devel \