Skip to content

Commit

Permalink
apacheGH-37715: [Packaging][CentOS] Use default g++ on CentOS 9 Stream (
Browse files Browse the repository at this point in the history
apache#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: apache#37715

Authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
  • Loading branch information
kou authored and loicalleyne committed Nov 13, 2023
1 parent 1c0b5a9 commit 040f186
Showing 1 changed file with 0 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -46,7 +43,6 @@ RUN \
libarchive \
libzstd-devel \
llvm-devel \
llvm-static \
lz4-devel \
make \
ncurses-devel \
Expand All @@ -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

0 comments on commit 040f186

Please sign in to comment.