Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 4.3k
ARROW-14171: [C++][Python][Packaging] Upgrade VCPKG version and add google-cloud-cpp dependency#11569
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.
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
Uh oh!
There was an error while loading. Please reload this page.
ARROW-14171: [C++][Python][Packaging] Upgrade VCPKG version and add google-cloud-cpp dependency #11569
Changes from all commits
b7bb8168b6755d0dfbc39a5beace8e3acb227dfacc47e8935fc00a9c9a5b28e31cd6aecbb82b60cf9cb73dd52eca01e3dea7367294108d9a55b57aa6f1822d796f0b5e041fa5573c8a0ee658ad0606f743560ce8c43db1d4efa1bd86daaccc9bfce9f8c7af40662793283d7a8d221c48e31380bFile filter
Filter by extension
Conversations
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -18,65 +18,61 @@ | ||
| ARG base | ||
| FROM ${base} | ||
| ARG arch_alias | ||
| ARG arch_short_alias | ||
| ARG arch | ||
| ARG arch_short | ||
| ARG manylinux | ||
| ENV MANYLINUX_VERSION=${manylinux} | ||
| # Install basic dependencies | ||
| RUN yum install -y git flex curl autoconf zip wget | ||
| # Install CMake | ||
| ARG cmake=3.19.3 | ||
| RUN wget -q https://github.com/Kitware/CMake/releases/download/v${cmake}/cmake-${cmake}-Linux-${arch_alias}.tar.gz -O - | \ | ||
| tar -xzf - --directory /usr/local --strip-components=1 | ||
| # AWS SDK doesn't work with CMake=3.22 due to https://gitlab.kitware.com/cmake/cmake/-/issues/22524 | ||
| ARG cmake=3.21.4 | ||
| COPY ci/scripts/install_cmake.sh arrow/ci/scripts/ | ||
| RUN /arrow/ci/scripts/install_cmake.sh ${arch} linux ${cmake} /usr/local | ||
| # Install Ninja | ||
| ARG ninja=1.10.2 | ||
| RUN mkdir /tmp/ninja && \ | ||
| wget -q https://github.com/ninja-build/ninja/archive/v${ninja}.tar.gz -O - | \ | ||
| tar -xzf - --directory /tmp/ninja --strip-components=1 && \ | ||
| cd /tmp/ninja && \ | ||
| ./configure.py --bootstrap && \ | ||
| mv ninja /usr/local/bin && \ | ||
| rm -rf /tmp/ninja | ||
| COPY ci/scripts/install_ninja.sh arrow/ci/scripts/ | ||
| RUN /arrow/ci/scripts/install_ninja.sh ${ninja} /usr/local | ||
| # Install ccache | ||
| ARG ccache=4.1 | ||
| RUN mkdir /tmp/ccache && \ | ||
| wget -q https://github.com/ccache/ccache/archive/v${ccache}.tar.gz -O - | \ | ||
| tar -xzf - --directory /tmp/ccache --strip-components=1 && \ | ||
| cd /tmp/ccache && \ | ||
| mkdir build && \ | ||
| cd build && \ | ||
| cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON .. && \ | ||
| ninja install && \ | ||
| rm -rf /tmp/ccache | ||
| COPY ci/scripts/install_ccache.sh arrow/ci/scripts/ | ||
| RUN /arrow/ci/scripts/install_ccache.sh ${ccache} /usr/local | ||
| # Install vcpkg | ||
| # Install vcpkg and in case of manylinux2010 install a more recent glibc>2.15 | ||
| # for the prebuilt vcpkg binary | ||
| ARG vcpkg | ||
| RUN git clone https://github.com/microsoft/vcpkg /opt/vcpkg && \ | ||
| git -C /opt/vcpkg checkout ${vcpkg} && \ | ||
| /opt/vcpkg/bootstrap-vcpkg.sh -useSystemBinaries -disableMetrics && \ | ||
| ln -s /opt/vcpkg/vcpkg /usr/bin/vcpkg | ||
| # Patch ports files as needed | ||
| ARG glibc=2.18 | ||
| COPY ci/vcpkg/*.patch \ | ||
| ci/vcpkg/*linux*.cmake \ | ||
| arrow/ci/vcpkg/ | ||
| RUN cd /opt/vcpkg && git apply --ignore-whitespace /arrow/ci/vcpkg/ports.patch | ||
| COPY ci/scripts/install_vcpkg.sh \ | ||
| ci/scripts/install_glibc.sh \ | ||
| arrow/ci/scripts/ | ||
| RUN arrow/ci/scripts/install_vcpkg.sh /opt/vcpkg ${vcpkg} && \ | ||
| if [ "${manylinux}" == "2010" ]; then \ | ||
| arrow/ci/scripts/install_glibc.sh ${glibc} /opt/glibc-${glibc} && \ | ||
| patchelf --set-interpreter /opt/glibc-2.18/lib/ld-linux-x86-64.so.2 /opt/vcpkg/vcpkg && \ | ||
| patchelf --set-rpath /opt/glibc-2.18/lib:/usr/lib64 /opt/vcpkg/vcpkg; \ | ||
| fi | ||
| ENV PATH="/opt/vcpkg:${PATH}" | ||
| ARG build_type=release | ||
| ENV CMAKE_BUILD_TYPE=${build_type} \ | ||
| VCPKG_FORCE_SYSTEM_BINARIES=1 \ | ||
| VCPKG_OVERLAY_TRIPLETS=/arrow/ci/vcpkg \ | ||
| VCPKG_DEFAULT_TRIPLET=${arch_short_alias}-linux-static-${build_type} \ | ||
| VCPKG_DEFAULT_TRIPLET=${arch_short}-linux-static-${build_type} \ | ||
| VCPKG_FEATURE_FLAGS=-manifests | ||
| # Need to install the boost-build prior installing the boost packages, otherwise | ||
| # vcpkg will raise an error. | ||
| # TODO(kszucs): factor out the package enumeration to a text file and reuse it | ||
| # from the windows image and potentially in a future macos wheel build | ||
| RUN vcpkg install --clean-after-build \ | ||
| boost-build:${arch_short_alias}-linux && \ | ||
| vcpkg install --clean-after-build \ | ||
| abseil \ | ||
| aws-sdk-cpp[config,cognito-identity,core,identity-management,s3,sts,transfer] \ | ||
| boost-filesystem \ | ||
Member There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm, do we still need boost-filesystem here? AFAIR the dependency is only for unit tests. Member There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Going to create a follow-up to remove it. Member There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. | ||
| @@ -87,6 +83,7 @@ RUN vcpkg install --clean-after-build \ | ||
| flatbuffers \ | ||
| gflags \ | ||
| glog \ | ||
| google-cloud-cpp[core,storage] \ | ||
| grpc \ | ||
| lz4 \ | ||
| openssl \ | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| set -e | ||
| if [ "$#" -ne 2 ]; then | ||
| echo "Usage: $0 <version> <prefix>" | ||
| exit 1 | ||
| fi | ||
| version=$1 | ||
| prefix=$2 | ||
| url="https://github.com/ccache/ccache/archive/v${version}.tar.gz" | ||
| mkdir /tmp/ccache | ||
| wget -q ${url} -O - | tar -xzf - --directory /tmp/ccache --strip-components=1 | ||
| mkdir /tmp/ccache/build | ||
| pushd /tmp/ccache/build | ||
| cmake \ | ||
| -GNinja \ | ||
| -DCMAKE_BUILD_TYPE=Release \ | ||
| -DCMAKE_INSTALL_PREFIX=${prefix} \ | ||
| -DZSTD_FROM_INTERNET=ON \ | ||
| .. | ||
| ninja install | ||
| popd | ||
| rm -rf /tmp/ccache |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| set -e | ||
| declare -A archs | ||
| archs=([amd64]=x86_64 | ||
| [arm64v8]=aarch64) | ||
| declare -A platforms | ||
| platforms=([linux]=linux | ||
| [macos]=macos | ||
| [windows]=windows) | ||
| if [ "$#" -ne 4 ]; then | ||
| echo "Usage: $0 <architecture> <platform> <version> <prefix>" | ||
| exit 1 | ||
| fi | ||
| arch=${archs[$1]} | ||
| platform=${platforms[$2]} | ||
| version=$3 | ||
| prefix=$4 | ||
| url="https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}-${platform}-${arch}.tar.gz" | ||
| wget -q ${url} -O - | tar -xzf - --directory ${prefix} --strip-components=1 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| set -e | ||
| if [ "$#" -ne 2 ]; then | ||
| echo "Usage: $0 <version> <prefix>" | ||
| exit 1 | ||
| fi | ||
| version=$1 | ||
| prefix=$2 | ||
| url="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.gz" | ||
| mkdir /tmp/glibc | ||
| wget -q ${url} -O - | tar -xzf - --directory /tmp/glibc --strip-components=1 | ||
| mkdir /tmp/glibc/build | ||
| pushd /tmp/glibc/build | ||
| ../configure --prefix=${prefix} | ||
| make -j$(nproc) | ||
| make install | ||
| popd | ||
| rm -rf /tmp/glibc |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| set -e | ||
| if [ "$#" -ne 2 ]; then | ||
| echo "Usage: $0 <version> <prefix>" | ||
| exit 1 | ||
| fi | ||
| version=$1 | ||
| prefix=$2 | ||
| url="https://github.com/ninja-build/ninja/archive/v${version}.tar.gz" | ||
| mkdir /tmp/ninja | ||
| wget -q ${url} -O - | tar -xzf - --directory /tmp/ninja --strip-components=1 | ||
| pushd /tmp/ninja | ||
| ./configure.py --bootstrap | ||
| mv ninja ${prefix}/bin | ||
| popd | ||
| rm -rf /tmp/ninja |
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.