Skip to content

Commit

Permalink
ARROW-12467: [C++][Gandiva] Add support for LLVM12
Browse files Browse the repository at this point in the history
Closes apache#10111 from kszucs/ARROW-12467

Lead-authored-by: Krisztián Szűcs <[email protected]>
Co-authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
  • Loading branch information
2 people authored and projjal committed Jun 9, 2021
1 parent c0aeaa4 commit 84599b5
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ DEBIAN=10
UBUNTU=18.04
FEDORA=33
PYTHON=3.6
LLVM=11
LLVM=12
CLANG_TOOLS=8
RUST=nightly-2020-11-24
GO=1.12
Expand Down
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,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 && \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ RUN \
apt update ${quiet} && \
apt install -y -V ${quiet} \
build-essential \
clang-10 \
ccache \
clang \
cmake \
debhelper \
devscripts \
Expand All @@ -57,7 +58,7 @@ RUN \
libthrift-dev \
libutf8proc-dev \
libzstd-dev \
llvm-10-dev \
llvm-dev \
lsb-release \
ninja-build \
pkg-config \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ RUN \
apt update ${quiet} && \
apt install -y -V ${quiet} \
build-essential \
clang-11 \
ccache \
clang \
cmake \
debhelper \
devscripts \
Expand All @@ -58,7 +59,7 @@ RUN \
libthrift-dev \
libutf8proc-dev \
libzstd-dev \
llvm-11-dev \
llvm-dev \
lsb-release \
ninja-build \
pkg-config \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ RUN \
apt install -y -V ${quiet} \
autoconf-archive \
build-essential \
clang-8 \
ccache \
clang \
cmake \
devscripts \
dh-autoreconf \
Expand All @@ -57,8 +58,13 @@ RUN \
libsnappy-dev \
libssl-dev \
libutf8proc-dev \
<<<<<<< HEAD:dev/tasks/linux-packages/apache-arrow/apt/ubuntu-xenial/Dockerfile
libzstd1-dev \
llvm-8-dev \
=======
libzstd-dev \
llvm-dev \
>>>>>>> c408048d1... ARROW-12467: [C++][Gandiva] Add support for LLVM12:dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile
lsb-release \
pkg-config \
protobuf-compiler \
Expand Down

0 comments on commit 84599b5

Please sign in to comment.