From de4d6b6b0b9b1bbf6adc16c1b480cf258db9a37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= <szucs.krisztian@gmail.com>
Date: Wed, 21 Apr 2021 11:03:51 +0900
Subject: [PATCH] ARROW-12467: [C++][Gandiva] Add support for LLVM12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #10111 from kszucs/ARROW-12467

Lead-authored-by: Krisztián Szűcs <szucs.krisztian@gmail.com>
Co-authored-by: Sutou Kouhei <kou@clear-code.com>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
---
 .env                                                         | 2 +-
 .travis.yml                                                  | 5 +----
 cpp/CMakeLists.txt                                           | 1 +
 .../apache-arrow/apt/debian-bullseye/Dockerfile              | 4 ++--
 .../linux-packages/apache-arrow/apt/debian-buster/Dockerfile | 4 ++--
 .../linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile  | 4 ++--
 .../linux-packages/apache-arrow/apt/ubuntu-groovy/Dockerfile | 4 ++--
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.env b/.env
index 4fb24bed40a12..587430579f9cb 100644
--- a/.env
+++ b/.env
@@ -45,7 +45,7 @@ DEBIAN=10
 UBUNTU=20.04
 FEDORA=33
 PYTHON=3.6
-LLVM=11
+LLVM=12
 CLANG_TOOLS=8
 RUST=nightly-2021-03-24
 GO=1.15
diff --git a/.travis.yml b/.travis.yml
index 2cf70cca982ff..26b4d78fd2da0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,7 +68,7 @@ jobs:
           -e CMAKE_UNITY_BUILD=ON
           -e CPP_MAKE_PARALLELISM=4
           "
-        # The LLVM's APT repository provides only arm64 binaries.
+        # The LLVM's APT repository doesn't provide arm64 binaries.
         # We should use LLVM provided by Ubuntu.
         LLVM: "10"
         UBUNTU: "20.04"
@@ -100,9 +100,6 @@ jobs:
           -e cares_SOURCE=BUNDLED
           -e gRPC_SOURCE=BUNDLED
           "
-        # The LLVM's APT repository provides only arm64 binaries.
-        # We should use LLVM provided by Ubuntu.
-        LLVM: "10"
         UBUNTU: "20.04"
 
     - name: "Go on s390x"
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 1705e854fb12d..4e88c32dcd6d4 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -109,6 +109,7 @@ set(ARROW_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 set(ARROW_DOC_DIR "share/doc/${PROJECT_NAME}")
 
 set(ARROW_LLVM_VERSIONS
+    "12.0"
     "11.1"
     "11.0"
     "10"
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile
index fa4961bc97e0a..761c44406e6fc 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile
@@ -37,7 +37,7 @@ RUN \
   apt install -y -V ${quiet} \
     build-essential \
     ccache \
-    clang-11 \
+    clang \
     cmake \
     debhelper \
     devscripts \
@@ -62,7 +62,7 @@ RUN \
     libthrift-dev \
     libutf8proc-dev \
     libzstd-dev \
-    llvm-11-dev \
+    llvm-dev \
     lsb-release \
     ninja-build \
     pkg-config \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile
index 5dcc1b46b2ddd..a5c8456e87e7f 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile
@@ -74,8 +74,8 @@ RUN \
     tzdata \
     zlib1g-dev && \
   apt install -y -V -t buster-backports ${quiet} \
-    clang-8 \
-    llvm-8-dev && \
+    clang-11 \
+    llvm-11-dev && \
   if apt list | grep '^nvidia-cuda-toolkit/'; then \
     apt install -y -V ${quiet} nvidia-cuda-toolkit; \
   fi && \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile
index ad83bfa90025a..8fe70edb6ad0e 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile
@@ -35,7 +35,7 @@ RUN \
   apt install -y -V ${quiet} \
     build-essential \
     ccache \
-    clang-10 \
+    clang \
     cmake \
     debhelper \
     devscripts \
@@ -58,7 +58,7 @@ RUN \
     libthrift-dev \
     libutf8proc-dev \
     libzstd-dev \
-    llvm-10-dev \
+    llvm-dev \
     lsb-release \
     ninja-build \
     pkg-config \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-groovy/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-groovy/Dockerfile
index d60e6320e3651..5209be29fb56a 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-groovy/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-groovy/Dockerfile
@@ -35,7 +35,7 @@ RUN \
   apt install -y -V ${quiet} \
     build-essential \
     ccache \
-    clang-11 \
+    clang \
     cmake \
     debhelper \
     devscripts \
@@ -59,7 +59,7 @@ RUN \
     libthrift-dev \
     libutf8proc-dev \
     libzstd-dev \
-    llvm-11-dev \
+    llvm-dev \
     lsb-release \
     ninja-build \
     pkg-config \