From 799211e97ceda8f7726bd77d8c101f48fcbfb77a Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Tue, 10 Dec 2024 12:02:33 +0900 Subject: [PATCH] alpine: use LLVM 15 on arm64 --- alpine/13-slim/Dockerfile | 4 ++-- alpine/13/Dockerfile | 4 ++-- alpine/14-slim/Dockerfile | 4 ++-- alpine/14/Dockerfile | 4 ++-- alpine/15-slim/Dockerfile | 4 ++-- alpine/15/Dockerfile | 4 ++-- alpine/16-slim/Dockerfile | 4 ++-- alpine/16/Dockerfile | 4 ++-- alpine/17-slim/Dockerfile | 4 ++-- alpine/17/Dockerfile | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/alpine/13-slim/Dockerfile b/alpine/13-slim/Dockerfile index 21564cd..73602d5 100644 --- a/alpine/13-slim/Dockerfile +++ b/alpine/13-slim/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/13/Dockerfile b/alpine/13/Dockerfile index 364d779..8172ea6 100644 --- a/alpine/13/Dockerfile +++ b/alpine/13/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/14-slim/Dockerfile b/alpine/14-slim/Dockerfile index 2d2903a..89f21b1 100644 --- a/alpine/14-slim/Dockerfile +++ b/alpine/14-slim/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/14/Dockerfile b/alpine/14/Dockerfile index af3112a..9e0506f 100644 --- a/alpine/14/Dockerfile +++ b/alpine/14/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/15-slim/Dockerfile b/alpine/15-slim/Dockerfile index 46b9ac1..3faeb6c 100644 --- a/alpine/15-slim/Dockerfile +++ b/alpine/15-slim/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/15/Dockerfile b/alpine/15/Dockerfile index 3bdb692..ba7d5f5 100644 --- a/alpine/15/Dockerfile +++ b/alpine/15/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/16-slim/Dockerfile b/alpine/16-slim/Dockerfile index ac650d7..477b891 100644 --- a/alpine/16-slim/Dockerfile +++ b/alpine/16-slim/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/16/Dockerfile b/alpine/16/Dockerfile index 7de62e0..d5bd73d 100644 --- a/alpine/16/Dockerfile +++ b/alpine/16/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/17-slim/Dockerfile b/alpine/17-slim/Dockerfile index 66a9e3b..ff8cdf7 100644 --- a/alpine/17-slim/Dockerfile +++ b/alpine/17-slim/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/17/Dockerfile b/alpine/17/Dockerfile index be218ca..0213be3 100644 --- a/alpine/17/Dockerfile +++ b/alpine/17/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \