You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2024/10/10 02:48:50 UTC

(arrow) branch main updated: GH-44347: [Packaging][C++] Enable Azure file system for deb/rpm (#44348)

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new dfa2d9fdde GH-44347: [Packaging][C++] Enable Azure file system for deb/rpm (#44348)
dfa2d9fdde is described below

commit dfa2d9fddedc09d85eefa41434f568b6e3264b28
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Thu Oct 10 11:48:43 2024 +0900

    GH-44347: [Packaging][C++] Enable Azure file system for deb/rpm (#44348)
    
    ### Rationale for this change
    
    Other file systems such as GCS file system and S3 file system are enabled.
    
    ### What changes are included in this PR?
    
    Enabled Azure file system.
    
    ### Are these changes tested?
    
    Yes.
    
    ### Are there any user-facing changes?
    
    Yes.
    * GitHub Issue: #44347
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 dev/tasks/linux-packages/apache-arrow/debian/rules                | 8 ++++++++
 dev/tasks/linux-packages/apache-arrow/yum/almalinux-8/Dockerfile  | 1 +
 dev/tasks/linux-packages/apache-arrow/yum/almalinux-9/Dockerfile  | 1 +
 .../linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile  | 1 +
 dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in           | 7 +++++++
 dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile     | 1 +
 .../linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile    | 1 +
 .../linux-packages/apache-arrow/yum/centos-9-stream/Dockerfile    | 1 +
 8 files changed, 21 insertions(+)

diff --git a/dev/tasks/linux-packages/apache-arrow/debian/rules b/dev/tasks/linux-packages/apache-arrow/debian/rules
index 40877f44db..9f04468015 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 d846915ab2..6fefd0fe39 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 222ab1b58d..45b86dcdfa 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 7f0f3e90a3..a19641f8f9 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 f588bb3f1a..9814843ab7 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
+++ b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
@@ -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)
@@ -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
@@ -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 \
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 e834e17a4b..b10c40937d 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 ce0a26a0e4..2730fd58cc 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 9522d999af..d436ed6a94 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 \