Skip to content

Commit

Permalink
log, set LIBARROW_MINIMAL
Browse files Browse the repository at this point in the history
  • Loading branch information
jonkeane committed Jan 19, 2024
1 parent 704dc89 commit 4937649
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions r/tools/nixlibs.R
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ validate_checksum <- function(binary_url, libfile, hush = quietly) {
# The warnings from system2 if it fails pop up later in the log and thus are
# more confusing than they are helpful (so we suppress them)
checksum_ok <- suppressWarnings(system2(
"shasum",
args = c("--status", "-a", "512", "-c", checksum_file),
stdout = ifelse(quietly, FALSE, ""),
stderr = ifelse(quietly, FALSE, "")
)) == 0
"shasum",
args = c("--status", "-a", "512", "-c", checksum_file),
stdout = ifelse(quietly, FALSE, ""),
stderr = ifelse(quietly, FALSE, "")
)) == 0

if (!checksum_ok) {
checksum_ok <- suppressWarnings(system2(
Expand Down Expand Up @@ -565,8 +565,8 @@ build_libarrow <- function(src_dir, dst_dir) {
env_var_list <- c(env_var_list, ARROW_DEPENDENCY_SOURCE = "BUNDLED")
}

# On macOS, if not otherwise set, let's override Boost_SOURCE to be bundled
# Necessary due to #39590 for CRAN
# On macOS, if not otherwise set, let's override Boost_SOURCE to be bundled
# Necessary due to #39590 for CRAN
if (on_macos) {
# Using lowercase (e.g. Boost_SOURCE) to match the cmake args we use already.
deps_to_bundle <- c("Boost", "lz4")
Expand Down Expand Up @@ -952,6 +952,12 @@ if (Sys.getenv("LIBARROW_BINARY") %in% c("false", "") && !env_is("LIBARROW_MINIM
download_ok <- download_ok && try_download("https://apache.jfrog.io/artifactory/arrow/r/")
}

if (!download_ok) {
lg("Download is not ok, so reverting to a minimal build.")
Sys.setenv(LIBARROW_MINIMAL = "true")
}


download_libarrow_ok <- download_ok && !env_is("LIBARROW_DOWNLOAD", "false")

# This "tools/thirdparty_dependencies" path, within the tar file, might exist if
Expand Down

0 comments on commit 4937649

Please sign in to comment.