diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake index 7fb0d41dc915b..91cc7340c543f 100644 --- a/cpp/cmake_modules/SetupCxxFlags.cmake +++ b/cpp/cmake_modules/SetupCxxFlags.cmake @@ -463,10 +463,10 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STRE set(CXX_ONLY_FLAGS "${CXX_ONLY_FLAGS} -fno-aligned-new") if(CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 20) - # Avoid C++17 std::get 'not available' issue on macOs 10.13 + # Avoid C++17 std::get 'not available' issue on macOS 10.13 # This will be required until atleast R 4.4 is released and # CRAN (hopefully) stops checking on 10.13 - set(CXX_ONLY_FLAGS "${CXX_ONLY_FLAGS} -D_LIBCPP_DISABLE_AVAILABILITY") + string(APPEND CXX_ONLY_FLAGS " -D_LIBCPP_DISABLE_AVAILABILITY") endif() endif() endif() diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index f6c15f0b87e5d..6fd7b51454a6c 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -1312,8 +1312,10 @@ macro(build_snappy) # to build failues by way of new compiler warnings. This adds a flag to disable # Werror to the very end of the invocation to override the snappy internal setting. if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - list(APPEND SNAPPY_CMAKE_ARGS - "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS_${CONFIG}} -Wno-error") + foreach(CONFIG DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) + list(APPEND SNAPPY_CMAKE_ARGS + "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS_${CONFIG}} -Wno-error") + endforeach() endif() if(APPLE AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 20) @@ -1321,6 +1323,8 @@ macro(build_snappy) # This can be removed once CRAN no longer checks on macOS 10.13 find_program(PATCH patch REQUIRED) set(SNAPPY_PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_CURRENT_LIST_DIR}/snappy.diff) + else() + set(SNAPPY_PATCH_COMMAND) endif() externalproject_add(snappy_ep diff --git a/dev/tasks/macros.jinja b/dev/tasks/macros.jinja index b90684304ea7b..54f676fd49cd9 100644 --- a/dev/tasks/macros.jinja +++ b/dev/tasks/macros.jinja @@ -330,13 +330,13 @@ on: {% endif %} {% if get_mac %} {% for openssl_version in ["1.1", "3.0"] %} - {% for arch in ["x86_64", "arm64"] %} + {% for arch in ["x86_64", "arm64"] %} - name: Get macOS {{ arch }} OpenSSL {{ openssl_version }} binary uses: actions/download-artifact@v3 with: name: r-lib__libarrow__bin__darwin-{{arch}}-openssl-{{ openssl_version }} path: repo/libarrow/bin/darwin-{{ arch }}-openssl-{{ openssl_version }} - {% endfor %} + {% endfor %} {% endfor %} {% endif %} - name: Get src pkg diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index 136df2ccd31b1..357f59aad8b08 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -263,7 +263,8 @@ jobs: repos = sub("file://", "file:", getOption("arrow.dev_repo")),, INSTALL_opts = INSTALL_opts ) - + + # Test library(arrow) arrow_info() @@ -285,8 +286,6 @@ jobs: with: name: r-pkg{{ '${{ steps.build.outputs.path }}' }} path: arrow_* - - test-linux-binary: needs: [source, linux-cpp] name: Test binary {{ '${{ matrix.config.image }}' }} diff --git a/r/tools/nixlibs.R b/r/tools/nixlibs.R index f71ea4ec97247..60deca05cd172 100644 --- a/r/tools/nixlibs.R +++ b/r/tools/nixlibs.R @@ -185,8 +185,8 @@ select_binary <- function(os = tolower(Sys.info()[["sysname"]]), # This tests that curl and OpenSSL are present (bc we can include their headers) # and it checks for other versions/features and raises errors that we grep for -test_for_curl_and_openssl <- - "#ifndef __APPLE__ +test_for_curl_and_openssl <- " +#ifndef __APPLE__ #include #ifdef _LIBCPP_VERSION #error Using libc++