Skip to content

ARROW-11971: [Packaging] Vcpkg patch doesn't apply on windows due to line endings #9713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

ARROW-11971: [Packaging] Vcpkg patch doesn't apply on windows due to line endings #9713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5bca16
[Packaging] Fix vcpkg patch
kszucs Mar 15, 2021
27c4393
Bump vcpkg's version
kszucs Mar 15, 2021
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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ R_TAG=latest
DEVTOOLSET_VERSION=-1

# Used for the manylinux and windows wheels
VCPKG=c7e96f2a5b73b3278b004aa88abec2f8ebfb43b5
VCPKG=fced4bef1606260f110d74de1ae1975c2b9ac549
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to bump vcpkg's version, otherwise I'm getting consistent download errors for mingw on windows.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hash points to the latest commit on vcpkg's main branch.

2 changes: 1 addition & 1 deletion ci/docker/python-wheel-manylinux-201x.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ RUN git clone https://github.com/microsoft/vcpkg /opt/vcpkg && \

# Patch ports files as needed
COPY ci/vcpkg arrow/ci/vcpkg
RUN cd /opt/vcpkg && patch -p1 -i /arrow/ci/vcpkg/ports.patch
RUN cd /opt/vcpkg && git apply --ignore-whitespace /arrow/ci/vcpkg/ports.patch

ARG build_type=release
ENV CMAKE_BUILD_TYPE=${build_type} \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/python-wheel-windows-vs2017.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN git clone https://github.com/Microsoft/vcpkg && \

# Patch ports files as needed
COPY ci/vcpkg arrow/ci/vcpkg
RUN cd vcpkg && patch -p1 -i C:/arrow/ci/vcpkg/ports.patch
RUN cd vcpkg && git apply --ignore-whitespace C:/arrow/ci/vcpkg/ports.patch

# Configure vcpkg and install dependencies
# NOTE: use windows batch environment notation for build arguments in RUN
Expand Down
12 changes: 6 additions & 6 deletions ci/vcpkg/ports.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ index f3704ef05..3af543058 100644
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-common
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-common
- REF 4a21a1c0757083a16497fea27886f5f20ccdf334 # v0.4.56
- SHA512 68898a8ac15d5490f45676eabfbe0df9e45370a74c543a28909fd0d85fed48dfcf4bcd6ea2d01d1a036dd352e2e4e0b08c48c63ab2a2b477fe150b46a827136e
- SHA512 68898a8ac15d5490f45676eabfbe0df9e45370a74c543a28909fd0d85fed48dfcf4bcd6ea2d01d1a036dd352e2e4e0b08c48c63ab2a2b477fe150b46a827136e
+ REF 13adef72b7813ec878817c6d50a7a3f241015d8a # v0.4.57
+ SHA512 28256522ac6af544d7464e3e7dcd4dc802ae2b09728bf8f167f86a6487bb756d0cad5eb4a2480610b2967b9c24c4a7f70621894517aa2828ffdeb0479453803b
HEAD_REF master
PATCHES
HEAD_REF master
PATCHES
disable-error-4068.patch # This patch fixes dependency port compilation failure
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 6e18aecd0..2ccecf33c 100644
Expand Down