ARROW-12467: [C++][Gandiva] Add support for LLVM12

Closes apache#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>
wesm · May 24, 2022 · de4d6b6 · de4d6b6
1 parent e43ab34
commit de4d6b6
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \