Skip to content

Commit

Permalink
apacheGH-45132 Upgrade LLVM to 18.1 which fixes the unexported orc sy…
Browse files Browse the repository at this point in the history
…mbol issu.
  • Loading branch information
lriggs committed Jan 24, 2025
1 parent c6b6bfb commit e77fae5
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ TZ=UTC
# Used through docker-compose.yml and serves as the default version for the
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
# docker tags more readable.
VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release
VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile.
Expand Down
2 changes: 2 additions & 0 deletions ci/docker/java-jni-manylinux-201x.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
12 changes: 6 additions & 6 deletions ci/vcpkg/ports.patch
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ index a79c72a59..6b7fa6a66 100644

vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0c7098082..c603c3653 100644
index 0312b2ae1..fdb576b5f 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
PATCHES
@@ -8,6 +8,7 @@ vcpkg_from_github(
fix_clang-cl_build.patch
no-werror.patch
pkgconfig.diff
+ "snappy-disable-bmi.patch"
)

vcpkg_cmake_configure(
file(COPY "${CURRENT_PORT_DIR}/snappy.pc.in" DESTINATION "${SOURCE_PATH}")

diff --git a/ports/snappy/snappy-disable-bmi.patch b/ports/snappy/snappy-disable-bmi.patch
new file mode 100644
index 000000000..e839c93a4
Expand All @@ -63,7 +63,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
Expand Down
1 change: 1 addition & 0 deletions ci/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
{
"name": "llvm",
"default-features": false,
"version>=": "18.1",
"features": [
"clang",
"default-targets",
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1338,6 +1338,7 @@ services:
build:
args:
base: ${REPO}:python-wheel-windows-test-vs2019-base-${PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION}
llvm: 18
context: .
dockerfile: ci/docker/python-free-threaded-wheel-windows-test-vs2019.dockerfile
volumes: *python-wheel-windows-vs2019-volumes
Expand Down

0 comments on commit e77fae5

Please sign in to comment.