diff --git a/ci/docker/java-jni-manylinux-201x.dockerfile b/ci/docker/java-jni-manylinux-201x.dockerfile index 479f4aa598b18..e1aa388f70e44 100644 --- a/ci/docker/java-jni-manylinux-201x.dockerfile +++ b/ci/docker/java-jni-manylinux-201x.dockerfile @@ -18,6 +18,8 @@ ARG base FROM ${base} +ARG LLVM=18 + # Install the libraries required by the Gandiva to run # Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva RUN vcpkg install \ diff --git a/ci/vcpkg/ports.patch b/ci/vcpkg/ports.patch index 39b51874b1c0e..d7f34843d2054 100644 --- a/ci/vcpkg/ports.patch +++ b/ci/vcpkg/ports.patch @@ -62,7 +62,7 @@ index 000000000..e839c93a4 + return v & ~(mask << (8 * n)); +-#endif + } -+ ++ + static inline bool LeftShiftOverflows(uint8_t value, uint32_t shift) { diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 1501782..71d2147 100644