From edf03109ec519dcb1fce815d9d6898cce1ca21a6 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sat, 17 Sep 2022 13:34:19 +0900 Subject: [PATCH] ARROW-17501: [Python][wheel] Use old AWS SDK C++ (#14157) Because the latest AWS SDK C++ has a problem: https://github.com/aws/aws-sdk-cpp/issues/1809 Authored-by: Sutou Kouhei Signed-off-by: Sutou Kouhei --- ci/docker/python-wheel-manylinux-201x.dockerfile | 3 +-- ci/scripts/python_wheel_manylinux_build.sh | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/docker/python-wheel-manylinux-201x.dockerfile b/ci/docker/python-wheel-manylinux-201x.dockerfile index 4f74b8b1c59df..adab10da623b0 100644 --- a/ci/docker/python-wheel-manylinux-201x.dockerfile +++ b/ci/docker/python-wheel-manylinux-201x.dockerfile @@ -75,8 +75,7 @@ RUN vcpkg install \ --x-feature=flight \ --x-feature=gcs \ --x-feature=json \ - --x-feature=parquet \ - --x-feature=s3 + --x-feature=parquet ARG python=3.8 ENV PYTHON_VERSION=${python} diff --git a/ci/scripts/python_wheel_manylinux_build.sh b/ci/scripts/python_wheel_manylinux_build.sh index 6fe26134fdb3c..4953da5790576 100755 --- a/ci/scripts/python_wheel_manylinux_build.sh +++ b/ci/scripts/python_wheel_manylinux_build.sh @@ -85,6 +85,9 @@ fi mkdir /tmp/arrow-build pushd /tmp/arrow-build +# ARROW-17501: We can remove -DAWSSDK_SOURCE=BUNDLED once +# https://github.com/aws/aws-sdk-cpp/issues/1809 is fixed and vcpkg +# ships the fix. cmake \ -DARROW_BROTLI_USE_SHARED=OFF \ -DARROW_BUILD_SHARED=ON \ @@ -117,6 +120,7 @@ cmake \ -DARROW_WITH_SNAPPY=${ARROW_WITH_SNAPPY} \ -DARROW_WITH_ZLIB=${ARROW_WITH_ZLIB} \ -DARROW_WITH_ZSTD=${ARROW_WITH_ZSTD} \ + -DAWSSDK_SOURCE=BUNDLED \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=/tmp/arrow-dist \