diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index 29ffd444370..fc6e0c5a1ca 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -83,7 +83,7 @@ jobs: run: | sudo sysctl -w kernel.core_pattern="core.%e.%p" ulimit -c unlimited - archery docker run ubuntu-r + archery docker run -e ARROW_S3=ON -e AWSSDK_SOURCE=BUNDLED ubuntu-r - name: Dump install logs run: cat r/check/arrow.Rcheck/00install.out if: always() @@ -132,7 +132,7 @@ jobs: run: | sudo sysctl -w kernel.core_pattern="core.%e.%p" ulimit -c unlimited - archery docker run r + archery docker run -e ARROW_S3=ON r - name: Dump install logs run: cat r/check/arrow.Rcheck/00install.out if: always() diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh index 53fd6a32d17..fe109b77b09 100755 --- a/ci/scripts/cpp_build.sh +++ b/ci/scripts/cpp_build.sh @@ -101,6 +101,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \ -DARROW_WITH_UTF8PROC=${ARROW_WITH_UTF8PROC:-ON} \ -DARROW_WITH_ZLIB=${ARROW_WITH_ZLIB:-OFF} \ -DARROW_WITH_ZSTD=${ARROW_WITH_ZSTD:-OFF} \ + -DAWSSDK_SOURCE=${AWSSDK_SOURCE:-} \ -Dbenchmark_SOURCE=${benchmark_SOURCE:-} \ -DBOOST_SOURCE=${BOOST_SOURCE:-} \ -DBrotli_SOURCE=${Brotli_SOURCE:-} \ diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index eed28d94ec3..b0326f0c235 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -2612,8 +2612,6 @@ endif() # AWS SDK for C++ macro(build_awssdk) - message( - FATAL_ERROR "FIXME: Building AWS C++ SDK from source will link with wrong libcrypto") message("Building AWS C++ SDK from source") set(AWSSDK_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/awssdk_ep-install") @@ -2632,7 +2630,7 @@ macro(build_awssdk) set(AWSSDK_CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib - -DBUILD_ONLY=s3;core;config;identity-management;sts + -DBUILD_ONLY=s3\\$core\\$config\\$identity-management\\$sts -DENABLE_UNITY_BUILD=on -DENABLE_TESTING=off "-DCMAKE_C_FLAGS=${EP_C_FLAGS}" diff --git a/r/inst/build_arrow_static.sh b/r/inst/build_arrow_static.sh index 86c1ee9ab5d..de964ab53f7 100755 --- a/r/inst/build_arrow_static.sh +++ b/r/inst/build_arrow_static.sh @@ -63,6 +63,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \ -DARROW_JEMALLOC=${ARROW_JEMALLOC:-ON} \ -DARROW_JSON=ON \ -DARROW_PARQUET=ON \ + -DARROW_S3=${ARROW_S3:-OFF} \ -DARROW_WITH_BROTLI=${ARROW_WITH_BROTLI:-$ARROW_DEFAULT_PARAM} \ -DARROW_WITH_BZ2=${ARROW_WITH_BZ2:-$ARROW_DEFAULT_PARAM} \ -DARROW_WITH_LZ4=${ARROW_WITH_LZ4:-$ARROW_DEFAULT_PARAM} \