From 1650b60ffaa692382a324a941e550ba6d437b1df Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Sat, 9 Oct 2021 05:31:46 +0900
Subject: [PATCH 1/2] ARROW-14265: [C++][Gandiva] Add support for LLVM 13

---
 .env               | 2 +-
 cpp/CMakeLists.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index 43cfefccee4..a08a1cd2544 100644
--- a/.env
+++ b/.env
@@ -45,7 +45,7 @@ DEBIAN=11
 UBUNTU=20.04
 FEDORA=33
 PYTHON=3.6
-LLVM=12
+LLVM=13
 CLANG_TOOLS=8
 GO=1.15
 NODE=14
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index e98a5d54948..1f3aee1a862 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -111,6 +111,7 @@ set(ARROW_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 set(ARROW_DOC_DIR "share/doc/${PROJECT_NAME}")
 
 set(ARROW_LLVM_VERSIONS
+    "13.0"
     "12.0"
     "11.1"
     "11.0"

From d91156ed48cc525d3b220ce3a159a326d2bbbbd1 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Sat, 9 Oct 2021 09:36:21 +0900
Subject: [PATCH 2/2] java-jni: use LLVM 12

Because LLVM packages for stretch aren't provided.
---
 ci/docker/linux-apt-jni.dockerfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ci/docker/linux-apt-jni.dockerfile b/ci/docker/linux-apt-jni.dockerfile
index 1abbf05af3b..03a17cc2437 100644
--- a/ci/docker/linux-apt-jni.dockerfile
+++ b/ci/docker/linux-apt-jni.dockerfile
@@ -33,13 +33,18 @@ RUN apt-get update -y -q && \
       wget && \
     code_name=$(lsb_release --codename --short) && \
     wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
+    if [ "${code_name}" = "stretch" -a "${llvm}" -gt "12" ]; then \
+      llvm_real=12; \
+    else \
+      llvm_real=${llvm}; \
+    fi; \
     apt-add-repository -y \
-      "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" && \
+      "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm_real} main" && \
     apt-get update -y -q && \
     apt-get install -y -q --no-install-recommends \
         ca-certificates \
         ccache \
-        clang-${llvm} \
+        clang-${llvm_real} \
         cmake \
         git \
         g++ \
@@ -52,7 +57,7 @@ RUN apt-get update -y -q && \
         libre2-dev \
         libsnappy-dev \
         libssl-dev \
-        llvm-${llvm}-dev \
+        llvm-${llvm_real}-dev \
         make \
         ninja-build \
         pkg-config \