This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch maint-0.17.x
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/maint-0.17.x by this push:
new 5a95295 ARROW-8786: [Packaging][rpm] Use bundled zstd in the CentOS 8
build
5a95295 is described below
commit 5a952953de99455e2b02a7cc569dc1f05251ea56
Author: Krisztián Szűcs <[email protected]>
AuthorDate: Thu May 14 06:48:52 2020 +0900
ARROW-8786: [Packaging][rpm] Use bundled zstd in the CentOS 8 build
There was an update in the epel-release repository in the last 12 hours,
since then yum/dnf is unable to find libzstd-devel.
libzstd is added to the BaseOS repository and removed from EPEL:
https://src.fedoraproject.org/rpms/zstd/c/2eaa0955a5176319f2a59294ee339cb2fff87bc5?branch=epel8
But CentOS 8 that includes zstd isn't released yet. We'll be able to revert
this change with the next CentOS 8 release.
Closes #7166 from kszucs/ARROW-8786
Lead-authored-by: Krisztián Szűcs <[email protected]>
Co-authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in | 5 +++++
dev/tasks/linux-packages/apache-arrow/yum/centos-8/Dockerfile | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
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 518d76c..6486875 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
+++ b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
@@ -45,6 +45,7 @@
%define use_meson (%{_centos_ver} >= 8)
%define have_rapidjson (%{_centos_ver} == 7)
+%define have_zstd (%{_centos_ver} < 8)
Name: @PACKAGE@
Version: @VERSION@
@@ -68,7 +69,9 @@ BuildRequires: git
%if %{_centos_ver} >= 7
BuildRequires: glog-devel
%endif
+%if %{have_zstd}
BuildRequires: libzstd-devel
+%endif
BuildRequires: lz4-devel
BuildRequires: pkgconfig
BuildRequires: python%{python_version}-devel
@@ -210,7 +213,9 @@ Requires: gflags
%if %{_centos_ver} >= 7
Requires: glog
%endif
+%if %{have_zstd}
Requires: libzstd
+%endif
Requires: lz4
%if %{_centos_ver} >= 8
Requires: re2
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/centos-8/Dockerfile
b/dev/tasks/linux-packages/apache-arrow/yum/centos-8/Dockerfile
index d10cf08..3f6701d 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/centos-8/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-8/Dockerfile
@@ -39,7 +39,7 @@ RUN \
glog-devel \
gobject-introspection-devel \
gtk-doc \
- libzstd-devel \
+ # libzstd-devel \
llvm-devel \
llvm-static \
lz4-devel \
