Port Conda patches, use vendored boost #2793
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tomjakubowski
force-pushed
the
arrow-conda-patch
branch
2 times, most recently
from
493b915 to
3e01a75
Compare
Did this work a bit out of order so squashed it all into one commit.
Conda related:
- switch to BUNDLED arrow dependency source
- this lets us remove our direct deps on lz4, flatbuffers, zstd
- add abi3 feature to crate + enable unless CONDA_BUILD is set
- when CONDA_BUILD is set, pass PYTHON to maturin build
--interpeter flag
- remove vestigal use of CMAKE_ARGS from .txt.in files
- parse CMAKE_ARGS from environment (unrelated to above item)
- this is so we pick up the cross-compiling toolchain (i.e.
CMAKE_LIBTOOL) in conda
Not conda related:
- switch away from global include_directories() calls
- these add include paths to every target, including our dependencies
- instead, export lists of INCLUDE_DIRS from every dependency,
and then assemble them into a list to be passed to
`target_include_directories` on the psp and perspective_esm targets
- decouples order of psp_build_dep() calls and order of include
directories
- switch Boost from a system dependency to psp_build_dep
- eventually, to support Conda, we'll add a "use system dependency"
feature to psp_build_dep for all dependencies
- caveat: the boost download is a bit slow
Signed-off-by: Tom Jakubowski <[email protected]>
- `generate-proto`: when enabled, proto.rs is generated at build time. When it is disabled, it is presumed that proto.rs has already been generated - `protobuf-src`: when enabled, protoc is built from source using a build-dependency on protobuf-src. When it is disabled, `PROTOC` must be set by the builder in the environment to a protobuf compiler Signed-off-by: Tom Jakubowski <[email protected]>
tomjakubowski
force-pushed
the
arrow-conda-patch
branch
from
3e01a75 to
f9ca424
Compare
tomjakubowski
changed the title
|
I think |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See the commit messages for more detail.
This PR includes:
ARROW_DEPENDENCY_SOURCEtoBUNDLEDinclude_directores