You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by np...@apache.org on 2020/01/18 17:14:43 UTC

[arrow] branch master updated: ARROW-7603: [Packaging][RPM] Add workaround for LLVM on CentOS 8

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d829d83  ARROW-7603: [Packaging][RPM] Add workaround for LLVM on CentOS 8
d829d83 is described below

commit d829d838a37da09838190f47e946dc982847e689
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Sat Jan 18 09:13:54 2020 -0800

    ARROW-7603: [Packaging][RPM] Add workaround for LLVM on CentOS 8
    
    CentOS 8.0.1905 provides LLVM 7 but CentOS 8.1.1911 provides only LLVM
    8. We should support LLVM 8 instead of using CentOS 8.0.1905. So this
    is just a workaround. We should remove this workaround later.
    
    Closes #6224 from kou/packaging-rpm-centos-8-llvm-7 and squashes the following commits:
    
    c3bb44d8f <Sutou Kouhei>  Add workaround for LLVM on CentOS 8
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Neal Richardson <ne...@gmail.com>
---
 dev/tasks/linux-packages/apache-arrow/yum/centos-8/Dockerfile | 7 +++++++
 1 file changed, 7 insertions(+)

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..ad260c8 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/centos-8/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-8/Dockerfile
@@ -24,6 +24,13 @@ ARG DEBUG
 
 RUN \
   quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
+  # CentOS 8.0.1905 provides LLVM 7 but CentOS 8.1.1911 provides only
+  # LLVM 8. We should remove this when we support LLVM 8.
+  sed -i'' \
+    -e 's/^mirrorlist/#mirrorlist/' \
+    -e 's/^#baseurl/baseurl/' \
+    -e 's/$releasever/8.0.1905/g' \
+    /etc/yum.repos.d/*.repo && \
   dnf install -y ${quiet} epel-release && \
   dnf install --enablerepo=PowerTools -y ${quiet} \
     bison \