From 2d2cfcffd507402d4ee843794b060235c8ce4591 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Fri, 19 Apr 2024 17:40:42 -0400 Subject: [PATCH] Update gcc from 9.2.1 to 12.2.1 to fix k-NN compile bug on ARM64 (#4647) Signed-off-by: Peter Zhu --- docker/ci/config/gcc-toolset-12-setup | 1 + docker/ci/config/gcc-toolset-9-setup | 1 - ...build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 docker/ci/config/gcc-toolset-12-setup delete mode 100755 docker/ci/config/gcc-toolset-9-setup diff --git a/docker/ci/config/gcc-toolset-12-setup b/docker/ci/config/gcc-toolset-12-setup new file mode 100755 index 0000000000..f7aa467fb1 --- /dev/null +++ b/docker/ci/config/gcc-toolset-12-setup @@ -0,0 +1 @@ +. /opt/rh/gcc-toolset-12/enable diff --git a/docker/ci/config/gcc-toolset-9-setup b/docker/ci/config/gcc-toolset-9-setup deleted file mode 100755 index 9547d06e33..0000000000 --- a/docker/ci/config/gcc-toolset-9-setup +++ /dev/null @@ -1 +0,0 @@ -. /opt/rh/gcc-toolset-9/enable diff --git a/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile b/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile index 6a4fbddecf..09cbb05417 100644 --- a/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile +++ b/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile @@ -90,9 +90,9 @@ RUN pip3 install cmake==3.23.3 # Upgrade gcc # The setup part is partially based on Austin Dewey's article: # https://austindewey.com/2019/03/26/enabling-software-collections-binaries-on-a-docker-image/ -RUN dnf -y install gcc-toolset-9-gcc gcc-toolset-9-gcc-c++ && dnf clean all && \ - echo "source /opt/rh/gcc-toolset-9/enable" > /etc/profile.d/gcc-toolset-9.sh -COPY --chown=0:0 config/gcc-toolset-9-setup /usr/local/bin/gcc_setup +RUN dnf -y install gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ && dnf clean all && \ + echo "source /opt/rh/gcc-toolset-12/enable" > /etc/profile.d/gcc-toolset-12.sh +COPY --chown=0:0 config/gcc-toolset-12-setup /usr/local/bin/gcc_setup ENV BASH_ENV="/usr/local/bin/gcc_setup" ENV ENV="/usr/local/bin/gcc_setup" ENV PROMPT_COMMAND=". /usr/local/bin/gcc_setup"