Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions ci/docker/cpp-jni.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,19 @@ ARG arch
ARG arch_short

# Install basic dependencies
RUN dnf install -y \
autoconf \
curl \
flex \
gdb \
git \
perl-IPC-Cmd \
perl-Time-Piece \
wget \
zip
RUN dnf module enable -y llvm-toolset && \
dnf install -y \
autoconf \
curl \
flex \
gdb \
git \
llvm-devel \
llvm-toolset \
perl-IPC-Cmd \
perl-Time-Piece \
wget \
zip

# A system Python is required for Ninja and vcpkg in this Dockerfile.
# On manylinux_2_28 base images, no system Python is installed.
Expand Down Expand Up @@ -96,7 +99,9 @@ RUN --mount=type=secret,id=github_repository_owner \
--x-feature=azure \
--x-feature=dev \
--x-feature=flight \
--x-feature=gandiva \
# We can't use LLVM installed by vcpkg with gcc-toolset because
# LLVM installed by vcpkg doesn't use libc++ installed by gcc-toolset.
# --x-feature=gandiva \
Comment thread
raulcd marked this conversation as resolved.
--x-feature=gcs \
--x-feature=json \
--x-feature=orc \
Expand Down
2 changes: 1 addition & 1 deletion ci/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"benchmark",
"boost-crc",
"boost-filesystem",
"boost-multiprecision",
"boost-process",
"gtest"
]
Expand Down Expand Up @@ -67,7 +68,6 @@
"boost-date-time",
"boost-format",
"boost-locale",
"boost-multiprecision",
"boost-predef",
"boost-regex",
"boost-system",
Expand Down
Loading