[arrow] branch main updated: GH-36686: [C++] Pass CMAKE_OSX_SYSROOT to external projects (#36706)

[paleolimbot]

This is an automated email from the ASF dual-hosted git repository.

paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 9ebb3d790f GH-36686: [C++] Pass CMAKE_OSX_SYSROOT to external projects 
(#36706)
9ebb3d790f is described below

commit 9ebb3d790f152965b1a756618edf38ad7ea0fcac
Author: Sutou Kouhei <k...@clear-code.com>
AuthorDate: Mon Jul 17 01:04:36 2023 +0900

    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 <k...@clear-code.com>
    Signed-off-by: Dewey Dunnington <de...@fishandwhistle.net>
---
 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 9b7dd8b80c..57defe0b36 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -913,6 +913,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 4c65a64c81..475494af18 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) -%}