This is an automated email from the ASF dual-hosted git repository. kszucs pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push: new 651aafc ARROW-11971: [Packaging] Vcpkg patch doesn't apply on windows due to line endings 651aafc is described below commit 651aafc029262da6a3ae5b1640fd8e0fe301916e Author: Krisztián Szűcs <szucs.kriszt...@gmail.com> AuthorDate: Wed Mar 17 12:14:54 2021 +0100 ARROW-11971: [Packaging] Vcpkg patch doesn't apply on windows due to line endings Closes #9713 from kszucs/vcpkg-patch Authored-by: Krisztián Szűcs <szucs.kriszt...@gmail.com> Signed-off-by: Krisztián Szűcs <szucs.kriszt...@gmail.com> --- .env | 2 +- ci/docker/python-wheel-manylinux-201x.dockerfile | 2 +- ci/docker/python-wheel-windows-vs2017.dockerfile | 2 +- ci/vcpkg/ports.patch | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 535a765..3c14623 100644 --- a/.env +++ b/.env @@ -70,4 +70,4 @@ R_TAG=latest DEVTOOLSET_VERSION=-1 # Used for the manylinux and windows wheels -VCPKG=c7e96f2a5b73b3278b004aa88abec2f8ebfb43b5 +VCPKG=fced4bef1606260f110d74de1ae1975c2b9ac549 diff --git a/ci/docker/python-wheel-manylinux-201x.dockerfile b/ci/docker/python-wheel-manylinux-201x.dockerfile index d9b3826..19246a4 100644 --- a/ci/docker/python-wheel-manylinux-201x.dockerfile +++ b/ci/docker/python-wheel-manylinux-201x.dockerfile @@ -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} \ diff --git a/ci/docker/python-wheel-windows-vs2017.dockerfile b/ci/docker/python-wheel-windows-vs2017.dockerfile index c0b85d4..0f66a20 100644 --- a/ci/docker/python-wheel-windows-vs2017.dockerfile +++ b/ci/docker/python-wheel-windows-vs2017.dockerfile @@ -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 diff --git a/ci/vcpkg/ports.patch b/ci/vcpkg/ports.patch index b1f4f09..14b9678 100644 --- a/ci/vcpkg/ports.patch +++ b/ci/vcpkg/ports.patch @@ -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