Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
3 changes: 1 addition & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ DEVTOOLSET_VERSION=
# Please also update the crossbow configuration in order to keep the github
# actions cache up to date for the macOS wheels:
# https://github.com/ursacomputing/crossbow/blob/master/.github/workflows/cache_vcpkg.yml
# TODO: Update to an official release tag https://github.com/apache/arrow/issues/35099
Comment thread
sjperkins marked this conversation as resolved.
VCPKG="b619a233fbf7b2c9765fb4458f3ecb05bd3166e3" # 2023.04.03
VCPKG="501db0f17ef6df184fcdbfbe0f87cde2313b6ab1" # 2023.04.15 Release

# This must be updated when we update
# ci/docker/python-wheel-windows-vs2017.dockerfile.
Expand Down
15 changes: 1 addition & 14 deletions ci/vcpkg/ports.patch
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,5 @@ index 0000000000..a57ce0c22f
+ return v & ~(mask << (8 * n));
+-#endif
+ }
+
+
+ static inline bool LeftShiftOverflows(uint8_t value, uint32_t shift) {
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 4611af6..d11936f 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -239,7 +239,7 @@ function(vcpkg_find_acquire_program program)
set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth)
else()
- set(program_name python3)
+ set(program_name python)
set(brew_package_name "python")
set(apt_package_name "python3")
endif()
Comment thread
sjperkins marked this conversation as resolved.