From fc13637f613f8cf2aff966621de8d6e17deedee2 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Fri, 6 Oct 2023 12:29:42 -0300 Subject: [PATCH 1/2] allow override of binary version --- r/tools/nixlibs.R | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/r/tools/nixlibs.R b/r/tools/nixlibs.R index 60deca05cd1..722e7ae3f26 100644 --- a/r/tools/nixlibs.R +++ b/r/tools/nixlibs.R @@ -88,8 +88,9 @@ thirdparty_dependency_dir <- Sys.getenv("ARROW_THIRDPARTY_DEPENDENCY_DIR", "tool download_binary <- function(lib) { + binary_version <- Sys.getenv("LIBARROW_BINARY_VERSION", VERSION) libfile <- tempfile() - binary_url <- paste0(arrow_repo, "bin/", lib, "/arrow-", VERSION, ".zip") + binary_url <- paste0(arrow_repo, "bin/", lib, "/arrow-", binary_version, ".zip") if (try_download(binary_url, libfile)) { if (!quietly) { cat(sprintf("*** Successfully retrieved C++ binaries (%s)\n", lib)) @@ -98,7 +99,7 @@ download_binary <- function(lib) { if (!quietly) { cat(sprintf( "*** Downloading libarrow binary failed for version %s (%s)\n at %s\n", - VERSION, lib, binary_url + binary_version, lib, binary_url )) } libfile <- NULL From 2de3d43f839132ed5f1af1aec04d783bb9b93257 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Fri, 6 Oct 2023 13:44:42 -0300 Subject: [PATCH 2/2] maybe on windows --- r/tools/winlibs.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/r/tools/winlibs.R b/r/tools/winlibs.R index b554770e40c..d5e3bdccc01 100644 --- a/r/tools/winlibs.R +++ b/r/tools/winlibs.R @@ -30,9 +30,10 @@ if (!file.exists(sprintf("windows/arrow-%s/include/arrow/api.h", VERSION))) { # Download static arrow from the apache artifactory quietly <- !identical(tolower(Sys.getenv("ARROW_R_DEV")), "true") get_file <- function(template, version) { + binary_version <- Sys.getenv("LIBARROW_BINARY_VERSION", version) try( suppressWarnings( - download.file(sprintf(template, version), "lib.zip", quiet = quietly) + download.file(sprintf(template, binary_version), "lib.zip", quiet = quietly) ), silent = quietly )