alpine: use LLVM 19 for arm64

It seems that the official PostgreSQL image is updated recently.
pgroonga · Dec 10, 2024 · d060858 · d060858
1 parent 6bc3988
commit d060858
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git 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 15)-dev \
+    clang19-dev \
     cmake \
     gettext-dev \
     linux-headers \
-    llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \
+    llvm19 \
     lz4-dev \
     msgpack-c-dev \
     rapidjson-dev \

diff --git 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 15)-dev \
+    clang19-dev \
     cmake \
     gettext-dev \
     linux-headers \
-    llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \
+    llvm19 \
     lz4-dev \
     msgpack-c-dev \
     rapidjson-dev \

diff --git 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 15)-dev \
+    clang19-dev \
     cmake \
     gettext-dev \
     linux-headers \
-    llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \
+    llvm19 \
     lz4-dev \
     msgpack-c-dev \
     rapidjson-dev \

diff --git 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 15)-dev \
+    clang19-dev \
     cmake \
     gettext-dev \
     linux-headers \
-    llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \
+    llvm19 \
     lz4-dev \
     msgpack-c-dev \
     rapidjson-dev \

diff --git 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 15)-dev \
+    clang19-dev \
     cmake \
     gettext-dev \
     linux-headers \
-    llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \
+    llvm19 \
     lz4-dev \
     msgpack-c-dev \
     rapidjson-dev \

diff --git 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 15)-dev \
+    clang19-dev \
     cmake \
     gettext-dev \
     linux-headers \
-    llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \
+    llvm19 \
     lz4-dev \
     msgpack-c-dev \
     rapidjson-dev \

diff --git 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 15)-dev \
+    clang19-dev \
     cmake \
     gettext-dev \
     linux-headers \
-    llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \
+    llvm19 \
     lz4-dev \
     msgpack-c-dev \
     rapidjson-dev \

diff --git 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 15)-dev \
+    clang19-dev \
     cmake \
     gettext-dev \
     linux-headers \
-    llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \
+    llvm19 \
     lz4-dev \
     msgpack-c-dev \
     rapidjson-dev \

diff --git 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 15)-dev \
+    clang19-dev \
     cmake \
     gettext-dev \
     linux-headers \
-    llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \
+    llvm19 \
     lz4-dev \
     msgpack-c-dev \
     rapidjson-dev \

diff --git 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 15)-dev \
+    clang19-dev \
     cmake \
     gettext-dev \
     linux-headers \
-    llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \
+    llvm19 \
     lz4-dev \
     msgpack-c-dev \
     rapidjson-dev \