From 137e50d7c84c7d9f81a362a0e40a8f538d9380c9 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 17 Jul 2023 01:04:36 +0900 Subject: [PATCH] GH-36686: [C++] Pass CMAKE_OSX_SYSROOT to external projects (#36706) ### Rationale for this change If we use different macOS SDK in Apache Arrow C++ and bundled projects, it will cause some problems such as a build error. ### What changes are included in this PR? Pass `CMAKE_OSX_SYSROOT` explicitly to external projects. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * Closes: #36686 Authored-by: Sutou Kouhei Signed-off-by: Dewey Dunnington --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 1 + dev/tasks/macros.jinja | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 456276abda05d..94f9260395d1d 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -916,6 +916,7 @@ set(EP_COMMON_CMAKE_ARGS -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=${CMAKE_EXPORT_NO_PACKAGE_REGISTRY} -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY} -DCMAKE_INSTALL_LIBDIR=lib + -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}) # Enable s/ccache if set by parent. diff --git a/dev/tasks/macros.jinja b/dev/tasks/macros.jinja index 1fdfc08be03e6..4b6774ef42b8c 100644 --- a/dev/tasks/macros.jinja +++ b/dev/tasks/macros.jinja @@ -238,13 +238,14 @@ on: cp ../dev/tasks/homebrew-formulae/autobrew/apache-arrow*.rb tools/ # Pin the git commit in the formula to match - cd tools + pushd tools if [ "{{ is_fork }}" == "true" ]; then - sed -i.bak -E -e 's/apache\/arrow.git"$/{{ arrow.github_repo.split("/") | join("\/") }}.git", :revision => "'"{{ arrow.head }}"'"/' apache-arrow*.rb + sed -i.bak -E -e 's/apache\/arrow.git", branch: "main"$/{{ arrow.github_repo.split("/") | join("\/") }}.git", :revision => "'"{{ arrow.head }}"'"/' apache-arrow*.rb else - sed -i.bak -E -e 's/arrow.git"$/arrow.git", :revision => "'"{{ arrow.head }}"'"/' apache-arrow*.rb + sed -i.bak -E -e 's/arrow.git", branch: "main"$/arrow.git", :revision => "'"{{ arrow.head }}"'"/' apache-arrow*.rb fi rm -f apache-arrow*.rb.bak + popd {% endmacro %} {%- macro github_change_r_pkg_version(is_fork, version) -%}