diff --git a/.env b/.env index 252f59ccfb2e6..0ec7cd8dc6961 100644 --- a/.env +++ b/.env @@ -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. 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 67fb2a4a3ea76..a4f22fae57748 100644 --- a/ci/vcpkg/ports.patch +++ b/ci/vcpkg/ports.patch @@ -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 @@ -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 diff --git a/ci/vcpkg/vcpkg.json b/ci/vcpkg/vcpkg.json index 58b1382d1ca88..348b4a4091399 100644 --- a/ci/vcpkg/vcpkg.json +++ b/ci/vcpkg/vcpkg.json @@ -78,6 +78,7 @@ { "name": "llvm", "default-features": false, + "version>=": "18.1", "features": [ "clang", "default-targets", diff --git a/docker-compose.yml b/docker-compose.yml index 87383568aaba4..776a84d264681 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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