Skip to content

ARROW-5564: [C++] Use uriparser from conda-forge #4767

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
pitrou wants to merge 1 commit into from
Closed

ARROW-5564: [C++] Use uriparser from conda-forge #4767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ci/conda_env_cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@ python
rapidjson
snappy
thrift-cpp>=0.11.0
uriparser
zlib
zstd
4 changes: 0 additions & 4 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@ if(ARROW_DEPENDENCY_SOURCE STREQUAL "CONDA")
endif()
set(ARROW_ACTUAL_DEPENDENCY_SOURCE "SYSTEM")
message(STATUS "Using CONDA_PREFIX for ARROW_PACKAGE_PREFIX: ${ARROW_PACKAGE_PREFIX}")
# ARROW-5564: Remove this when uriparser gets a conda package
if("${uriparser_SOURCE}" STREQUAL "")
set(uriparser_SOURCE "AUTO")
endif()
else()
set(ARROW_ACTUAL_DEPENDENCY_SOURCE "${ARROW_DEPENDENCY_SOURCE}")
endif()
Expand Down
2 changes: 2 additions & 0 deletions dev/tasks/conda-recipes/arrow-cpp/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ requirements:
- re2
- snappy
- thrift-cpp >=0.11
- uriparser
- zlib
- zstd

Expand All @@ -55,6 +56,7 @@ requirements:
- python
- re2
- snappy
- uriparser
- zlib
- zstd

Expand Down