From 82039acddfd391259531664e3d02811065f9578a Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Tue, 7 Dec 2021 10:43:39 +0000 Subject: [PATCH 1/3] Update default ARROW_DEPENDENCY_SOURCE value --- r/NEWS.md | 2 ++ r/configure | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/r/NEWS.md b/r/NEWS.md index 5df8c2d57934..8576d38edfcf 100644 --- a/r/NEWS.md +++ b/r/NEWS.md @@ -24,6 +24,8 @@ * `col_names` identical to `include_header` * other arguments are currently unsupported, but the function errors with a meaningful message. * Added `decimal128()` (identical to `decimal()`) as the name is more explicit and updated docs to encourage its use. +* Source builds now by default use `pkg-config` to search for system dependencies (such as `libz`) and link to them +if present. To retain the previous behaviour of downloading and building all dependencies, set `ARROW_DEPENDENCY_SOURCE=BUNDLED`. # arrow 6.0.1 diff --git a/r/configure b/r/configure index 13177c5875f3..9c256eb776ba 100755 --- a/r/configure +++ b/r/configure @@ -153,8 +153,7 @@ else fi if [ "${ARROW_DEPENDENCY_SOURCE}" = "" ]; then - # TODO: BUNDLED is still default for now, but we plan to change it to AUTO - ARROW_DEPENDENCY_SOURCE=BUNDLED; export ARROW_DEPENDENCY_SOURCE + ARROW_DEPENDENCY_SOURCE=AUTO; export ARROW_DEPENDENCY_SOURCE fi if [ "${ARROW_DEPENDENCY_SOURCE}" = "AUTO" ]; then pkg-config --version >/dev/null 2>&1 From 1938ed9cbbad060135046c088e6fb7472a54c975 Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Tue, 7 Dec 2021 10:46:04 +0000 Subject: [PATCH 2/3] Add task for bundled dep source --- dev/tasks/tasks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 4b7895576d61..797786a47ca2 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1146,14 +1146,14 @@ tasks: ci: github template: r/github.devdocs.yml - test-r-depsource-auto: + test-r-depsource-bundled: ci: azure template: r/azure.linux.yml params: r_org: rocker r_image: r-base r_tag: latest - flags: '-e ARROW_DEPENDENCY_SOURCE=AUTO' + flags: '-e ARROW_DEPENDENCY_SOURCE=BUNDLED' test-r-depsource-system: ci: github From d16fe7dca1e7f0e24481ce92255d3b314a5bd855 Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Tue, 7 Dec 2021 12:34:47 +0000 Subject: [PATCH 3/3] Update messaging --- r/configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/r/configure b/r/configure index 9c256eb776ba..dff38f877341 100755 --- a/r/configure +++ b/r/configure @@ -159,8 +159,7 @@ else pkg-config --version >/dev/null 2>&1 if [ $? -ne 0 ]; then export ARROW_DEPENDENCY_SOURCE=BUNDLED - echo "**** Warning: ARROW_DEPENDENCY_SOURCE set to 'AUTO' but pkg-config not installed" - echo "**** ARROW_DEPENDENCY_SOURCE has been set to 'BUNDLED'" + echo "**** pkg-config not installed, setting ARROW_DEPENDENCY_SOURCE=BUNDLED" fi fi