Misc build-related fixes #2
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
pkg-config needs the ability to be re-enabled if `default-features` are set to false. This cannot be done outside of an extra feature flag, so feature `pkgconfig` is added. Also, `libevent-sys` is added to `libevent-rs` without default features, so they can be controlled entirely from the latter.
`FindOpenSSL` relies on this, so map the `DEP_OPENSSL_ROOT` supplied by `openssl-sys` (or try to create using `DEP_OPENSSL_INCLUDE`).
elbe0046
approved these changes
May 17, 2020
jmagnuson
commented
May 18, 2020
| @@ -30,6 +30,18 @@ fn build_libevent(libevent_path: impl AsRef<std::path::Path>) -> PathBuf { | |||
| } | |||
|
|
|||
| config.register_dep("openssl"); | |||
|
|
|||
| let openssl_root = if let Ok(root) = env::var("DEP_OPENSSL_ROOT") { | |||
There was a problem hiding this comment.
For posterity, this metadata was only added in openssl-sys 0.9.48 (sfackler/rust-openssl@ef86438), and the logic here exists to be backwards-compatible with earlier versions.
nastevens
reviewed
May 18, 2020
| static = [ "libevent-sys/static" ] | ||
| pkgconfig = [ "libevent-sys/pkgconfig" ] |
There was a problem hiding this comment.
If a package is optional you can include it the same as you'd include a feature - so this can just be libevent-sys/pkg-config and you can remove the named feature in the libevent-sys crate. Additionally you could just add the feature libevent-sys/pkg-config to your default config and get rid of all the pkgconfig aliases.
nastevens
approved these changes
May 18, 2020
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.
Fixes a few issues seen when cross-compiling, and also when building from OSX:
pkgconfigto be able to re-enable pkg-config support when building withdefault-features = false.clang_argfor bindgen. There were issues encountered when cross-compiling, and it gets discovered by bindgen internally, anyway. I still haven't looked into the code path discrepancies, but I suspect there might be an issue with not also setting the sysroot. TBD.OPENSSL_ROOT_DIRinto cmake when doing bundled builds.FindOpenSSL.cmakeneeds this.Also included are some additions for verbose building.