sys: introduce bundled building #1
Conversation
This will be used in bundled builds.
|
In 7325963 it'd be nice to note that the bundled version corresponds to libevent |
libevent-sys/Cargo.toml
Outdated
|
|
||
| [build-dependencies] | ||
| bindgen = "^0.45" | ||
| cmake = { version = "0.1", optional = true } | ||
| pkg-config = "^0.3" |
There was a problem hiding this comment.
Should pkg-config be optional and only enabled if not using the bundled feature?
There was a problem hiding this comment.
Hmm, I think that would mean either default-features = false wouldn't be supported by libevent-sys, or introducing the need for handling features pkg-config and bundled as non-mutually-exclusive.
Update: bundled is now required to build if --no-default-features is used.
libevent-sys/build.rs
Outdated
| }; | ||
| // TODO: Probably combine all pc includes, just to be safe. | ||
|
|
||
| pkg.cargo_metadata(true).probe("libevent_core").unwrap(); |
There was a problem hiding this comment.
This seems to be duplicating 3f83d47#diff-adab382290cb5e55b3ad3eb478c2c84fR48
There was a problem hiding this comment.
So I lifted this pattern from curl-sys thinking that it had to do with operation ordering between emitting includes and libs. But looking again, I wonder if it has to do with preventing emission of libs in case curl_config_reports_http2 fails out a few lines up. But if that's the case, why not just do the check first-thing?
| @@ -24,6 +24,11 @@ fn build_libevent(libevent_path: &str) -> PathBuf { | |||
| .define("CMAKE_POLICY_DEFAULT_CMP0066", "NEW")*/ | |||
| } | |||
|
|
|||
| // TODO: Can we tap into "-vv" cargo argument? | |||
There was a problem hiding this comment.
I tried playing around with the following build.rs to see if anything was passed in when doing -vv, but I didn't find anything.
use std::env;
pub fn main() {
for value in env::args() {
println!("cargo:warning={}", value);
}
for (name, value) in env::vars() {
println!("cargo:warning={}={}", name, value);
}
}There was a problem hiding this comment.
I also drilled into cargo's CLI code for a bit and saw that the flag eventually reaches the Shell struct which handles the printing, but don't think there's any way to access that.
Adds `cmake` as a build-dependency in order to do builds directly from libevent source. This feature flag also serves as a toggle between building and the current method of discovery using pkg-config. This is done to try and simplify the logical complexity of the build script.
Enables verbose CMake builds, and dumps environment variables and cargo arguments.
If `bundled`, will add the appropriate CMake flag to the build. If not, attempts to link with the proper library that pkg-config found.
If `bundled`, will add the appropriate CMake flag to the build. If not, attempts to link with the proper library that pkg-config found. Also available is the `bundled_openssl` feature, to tell `openssl-sys` to build from source and statically link. One caveat is that I haven't quite figured out how to separate bundled openssl forcing pthread support (at least from the `openssl-sys` layer), so for now `bundled_openssl` implies `threading`.
jmagnuson
force-pushed
the
feature/map-cmake-variables
branch
from
b19326e
to
044df41
Compare
Adds bundled source builds via CMake and the
bundledfeature flag. Also adds configuration for OpenSSL (openssl/openssl_bundled) and pthreads (threading).