fall back to bundled boost and lz4 on macos

apache · Jan 12, 2024 · bacfdbe · bacfdbe
1 parent a9a3b10
commit bacfdbe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/r/inst/build_arrow_static.sh b/r/inst/build_arrow_static.sh
@@ -74,6 +74,8 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
     -DARROW_DATASET=${ARROW_DATASET:-ON} \
     -DARROW_DEPENDENCY_SOURCE=${ARROW_DEPENDENCY_SOURCE:-AUTO} \
     -DAWSSDK_SOURCE=${AWSSDK_SOURCE:-} \
+    -DBoost_SOURCE=${BOOST_SOURCE:-} \
+    -Dlz4_SOURCE=${LZ4_SOURCE:-} \
     -DARROW_FILESYSTEM=ON \
     -DARROW_GCS=${ARROW_GCS:-$ARROW_DEFAULT_PARAM} \
     -DARROW_JEMALLOC=${ARROW_JEMALLOC:-$ARROW_DEFAULT_PARAM} \

diff --git a/r/tools/nixlibs.R b/r/tools/nixlibs.R
@@ -564,8 +564,13 @@ build_libarrow <- function(src_dir, dst_dir) {
 
   # On macOS, if not otherwise set, let's override Boost_SOURCE to be bundled
   if (on_macos) {
-    if (Sys.getenv("Boost_SOURCE") == "") {
-      env_var_list <- c(env_var_list, Boost_SOURCE = "BUNDLED")
+    deps_to_bundle <- c("Boost", "lz4")
+    for (dep_to_bundle in deps_to_bundle) {
+      env_var <- paste0(dep_to_bundle, "_SOURCE")
+      if (Sys.getenv(env_var) == "") {
+        # TODO: env_var_list gets checked for caps, so we need to do that, but maybe it shouldn't?
+        env_var_list <- c(env_var_list, setNames("BUNDLED", toupper(env_var)))
+      }
     }
   }