Skip to content

ARROW-14850: [R] Update ARROW_DEPENDENCY_SOURCE to default to AUTO #11881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thisisnic wants to merge 3 commits into from
Closed

ARROW-14850: [R] Update ARROW_DEPENDENCY_SOURCE to default to AUTO #11881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82039ac
Update default ARROW_DEPENDENCY_SOURCE value
thisisnic Dec 7, 2021
1938ed9
Add task for bundled dep source
thisisnic Dec 7, 2021
d16fe7d
Update messaging
thisisnic Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions r/NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 2 additions & 4 deletions r/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,13 @@ 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

@nealrichardson nealrichardson Dec 7, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Can't leave this comment below but) on L162, we should revise the message, maybe just

echo "**** pkg-config not installed, setting ARROW_DEPENDENCY_SOURCE=BUNDLED"

@thisisnic thisisnic Dec 7, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

fi
if [ "${ARROW_DEPENDENCY_SOURCE}" = "AUTO" ]; then
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

Expand Down