diff --git a/ci/docker/debian-10-cpp.dockerfile b/ci/docker/debian-10-cpp.dockerfile index 15c85b868ba5f..bb2fa4c8db43f 100644 --- a/ci/docker/debian-10-cpp.dockerfile +++ b/ci/docker/debian-10-cpp.dockerfile @@ -96,11 +96,12 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_ZSTD=ON \ AWSSDK_SOURCE=BUNDLED \ cares_SOURCE=BUNDLED \ - CC=gcc \ - CXX=g++ \ gRPC_SOURCE=BUNDLED \ GTest_SOURCE=BUNDLED \ ORC_SOURCE=BUNDLED \ - PATH=/usr/lib/ccache/:$PATH \ Protobuf_SOURCE=BUNDLED \ - zstd_SOURCE=BUNDLED + zstd_SOURCE=BUNDLED \ + xsimd_SOURCE=BUNDLED \ + PATH=/usr/lib/ccache/:$PATH \ + CC=gcc \ + CXX=g++ diff --git a/ci/docker/debian-11-cpp.dockerfile b/ci/docker/debian-11-cpp.dockerfile index 1bb67e334e82e..0cd04e1545ee0 100644 --- a/ci/docker/debian-11-cpp.dockerfile +++ b/ci/docker/debian-11-cpp.dockerfile @@ -97,8 +97,9 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ AWSSDK_SOURCE=BUNDLED \ - CC=gcc \ - CXX=g++ \ ORC_SOURCE=BUNDLED \ + Protobuf_SOURCE=BUNDLED \ + xsimd_SOURCE=BUNDLED \ PATH=/usr/lib/ccache/:$PATH \ - Protobuf_SOURCE=BUNDLED + CC=gcc \ + CXX=g++ diff --git a/ci/docker/fedora-35-cpp.dockerfile b/ci/docker/fedora-35-cpp.dockerfile index b79ceb894bf6d..c82c40c7de950 100644 --- a/ci/docker/fedora-35-cpp.dockerfile +++ b/ci/docker/fedora-35-cpp.dockerfile @@ -89,10 +89,11 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ - AWSSDK_SOURCE=BUNDLED \ - CC=gcc \ - CXX=g++ \ - ORC_SOURCE=BUNDLED \ PARQUET_BUILD_EXECUTABLES=ON \ PARQUET_BUILD_EXAMPLES=ON \ - PATH=/usr/lib/ccache/:$PATH + AWSSDK_SOURCE=BUNDLED \ + ORC_SOURCE=BUNDLED \ + xsimd_SOURCE=BUNDLED \ + PATH=/usr/lib/ccache/:$PATH \ + CC=gcc \ + CXX=g++ diff --git a/ci/docker/ubuntu-18.04-cpp.dockerfile b/ci/docker/ubuntu-18.04-cpp.dockerfile index ed038f4c4c57d..405af8e0653b9 100644 --- a/ci/docker/ubuntu-18.04-cpp.dockerfile +++ b/ci/docker/ubuntu-18.04-cpp.dockerfile @@ -121,12 +121,13 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ + PARQUET_BUILD_EXAMPLES=ON \ + PARQUET_BUILD_EXECUTABLES=ON \ AWSSDK_SOURCE=BUNDLED \ GTest_SOURCE=BUNDLED \ ORC_SOURCE=BUNDLED \ - PARQUET_BUILD_EXAMPLES=ON \ - PARQUET_BUILD_EXECUTABLES=ON \ - PATH=/usr/lib/ccache/:$PATH \ Thrift_SOURCE=BUNDLED \ utf8proc_SOURCE=BUNDLED \ - zstd_SOURCE=BUNDLED + zstd_SOURCE=BUNDLED \ + xsimd_SOURCE=BUNDLED \ + PATH=/usr/lib/ccache/:$PATH diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile index 6e811ea2f71f5..5cae684d1b7f0 100644 --- a/ci/docker/ubuntu-20.04-cpp.dockerfile +++ b/ci/docker/ubuntu-20.04-cpp.dockerfile @@ -146,14 +146,15 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ - ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-${llvm}/bin/llvm-symbolizer \ + PARQUET_BUILD_EXAMPLES=ON \ + PARQUET_BUILD_EXECUTABLES=ON \ AWSSDK_SOURCE=BUNDLED \ google_cloud_cpp_storage_SOURCE=BUNDLED \ GTest_SOURCE=BUNDLED \ gRPC_SOURCE=BUNDLED \ ORC_SOURCE=BUNDLED \ - PARQUET_BUILD_EXAMPLES=ON \ - PARQUET_BUILD_EXECUTABLES=ON \ - PATH=/usr/lib/ccache/:$PATH \ Protobuf_SOURCE=BUNDLED \ + xsimd_SOURCE=BUNDLED \ + ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-${llvm}/bin/llvm-symbolizer \ + PATH=/usr/lib/ccache/:$PATH \ PYTHON=python3 diff --git a/ci/docker/ubuntu-22.04-cpp.dockerfile b/ci/docker/ubuntu-22.04-cpp.dockerfile index a7cc5ff38ad8c..0c6a4ea1ca15e 100644 --- a/ci/docker/ubuntu-22.04-cpp.dockerfile +++ b/ci/docker/ubuntu-22.04-cpp.dockerfile @@ -174,11 +174,12 @@ ENV ARROW_BUILD_TESTS=ON \ ARROW_WITH_SNAPPY=ON \ ARROW_WITH_ZLIB=ON \ ARROW_WITH_ZSTD=ON \ + PARQUET_BUILD_EXAMPLES=ON \ + PARQUET_BUILD_EXECUTABLES=ON \ AWSSDK_SOURCE=BUNDLED \ GTest_SOURCE=BUNDLED \ ORC_SOURCE=BUNDLED \ - PARQUET_BUILD_EXAMPLES=ON \ - PARQUET_BUILD_EXECUTABLES=ON \ Protobuf_SOURCE=BUNDLED \ + xsimd_SOURCE=BUNDLED \ PATH=/usr/lib/ccache/:$PATH \ PYTHON=python3 diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh index d88d95b67747a..8e823b05396f9 100755 --- a/ci/scripts/cpp_build.sh +++ b/ci/scripts/cpp_build.sh @@ -161,6 +161,7 @@ cmake \ -DThrift_SOURCE=${Thrift_SOURCE:-} \ -Dutf8proc_SOURCE=${utf8proc_SOURCE:-} \ -Dzstd_SOURCE=${zstd_SOURCE:-} \ + -Dxsimd_SOURCE=${xsimd_SOURCE:-} \ -G "${CMAKE_GENERATOR:-Ninja}" \ ${CMAKE_ARGS} \ ${source_dir} diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 270484ef74416..ad59a43222bc3 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -2235,8 +2235,6 @@ endif() set(ARROW_XSIMD_REQUIRED_VERSION "8.1.0") if(ARROW_USE_XSIMD) - # Distros don't always provide up to date xsimd packages - set(xsimd_SOURCE "AUTO") resolve_dependency(xsimd REQUIRED_VERSION ${ARROW_XSIMD_REQUIRED_VERSION}) if(xsimd_SOURCE STREQUAL "BUNDLED")