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 2023/09/15 02:32:35 UTC
[arrow] branch main updated: GH-37715: [Packaging][CentOS] Use default g++ on CentOS 9 Stream (#37718)
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 49890e94a0 GH-37715: [Packaging][CentOS] Use default g++ on CentOS 9 Stream (#37718)
49890e94a0 is described below
commit 49890e94a0e878c60d8b4a62f48665f494ab2067
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Fri Sep 15 11:32:28 2023 +0900
GH-37715: [Packaging][CentOS] Use default g++ on CentOS 9 Stream (#37718)
### Rationale for this change
We can use default g++ by using shared LLVM library.
### What changes are included in this PR?
Use default g++ and remove needless `llvm-static`.
### Are these changes tested?
Yes.
### Are there any user-facing changes?
Yes.
* Closes: #37715
Authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
.../apache-arrow/yum/centos-9-stream/Dockerfile | 12 ------------
1 file changed, 12 deletions(-)
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 513a63fee8..b1e1630103 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
@@ -18,15 +18,12 @@
ARG FROM=quay.io/centos/centos:stream9
FROM ${FROM}
-ENV SCL=gcc-toolset-12
-
ARG DEBUG
RUN \
quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
dnf install -y ${quiet} epel-release && \
dnf install --enablerepo=crb -y ${quiet} \
- ${SCL} \
bison \
boost-devel \
brotli-devel \
@@ -46,7 +43,6 @@ RUN \
libarchive \
libzstd-devel \
llvm-devel \
- llvm-static \
lz4-devel \
make \
ncurses-devel \
@@ -65,11 +61,3 @@ RUN \
vala \
zlib-devel && \
dnf clean ${quiet} all
-
-# Workaround: We can remove this once redhat-rpm-config uses "annobin"
-# not "gcc-annobin".
-RUN \
- sed \
- -i \
- -e 's/gcc-annobin/annobin/g' \
- /usr/lib/rpm/redhat/redhat-annobin-select-gcc-built-plugin