Update complex_sys example cargo-raze outputs #549
Conversation
sitaktif
force-pushed
the
complex-sys-raze-0.8
branch
from
eb5ad47 to
b4086a0
Compare
|
(rebased onto latest master) |
examples/complex_sys/BUILD.bazel
Outdated
| @@ -0,0 +1,22 @@ | |||
| """ | |||
There was a problem hiding this comment.
This file is masking the BUILD file that has the target defined in it. This is likely a side effect of having run cargo-raze without package_aliases_dir set to "raze".
There was a problem hiding this comment.
Oh I see, thanks for spotting this, and you're right, that's exactly what happened. I assumed it was a new build file generated by cargo-raze and didn't even try to make sense of it, sorry about that.
Now I can see the error you hit earlier, I'll work on fixing it.
There was a problem hiding this comment.
If it helps, I'm also trying to build openssl-sys for my PR here: google/cargo-raze#340 (see //third_party/openssl/... and //third_party/cargo/remote/BUILD.openssl-sys-0.9.60.bazel
I got it to work on MacOS but that's only because the build.rs script was able to find openssl on my machine and it wasn't using the target I wanted it to. Been trying to get back to that but haven't had the time. Hoping to find the time this weekend 😅
There was a problem hiding this comment.
Right, so I was looking at the diff of the complex_sys example build scripts (before and after running cargo-raze) and got reminded that cargo-raze does not currently handle a couple of attributes that are needed for openssl to work.
Namely, these two manual changes are needed here:
examples/complex_sys $ grep '# MODIFIED MANUALLY #' -A5 -r raze
raze/remote/BUILD.libssh2-sys-0.2.20.bazel: # MODIFIED MANUALLY #
raze/remote/BUILD.libssh2-sys-0.2.20.bazel- links = "ssh2",
raze/remote/BUILD.libssh2-sys-0.2.20.bazel- data = glob(["**"]) + [
raze/remote/BUILD.libssh2-sys-0.2.20.bazel- "@openssl",
raze/remote/BUILD.libssh2-sys-0.2.20.bazel- ],
raze/remote/BUILD.libssh2-sys-0.2.20.bazel- # / MODIFIED MANUALLY #
--
raze/remote/BUILD.openssl-sys-0.9.60.bazel: # MODIFIED MANUALLY #
raze/remote/BUILD.openssl-sys-0.9.60.bazel- build_script_env = {
raze/remote/BUILD.openssl-sys-0.9.60.bazel- "OPENSSL_DIR": "../openssl/openssl",
raze/remote/BUILD.openssl-sys-0.9.60.bazel- },
raze/remote/BUILD.openssl-sys-0.9.60.bazel- # / MODIFIED MANUALLY #
raze/remote/BUILD.openssl-sys-0.9.60.bazel- crate_features = [
--
raze/remote/BUILD.openssl-sys-0.9.60.bazel: # MODIFIED MANUALLY #
raze/remote/BUILD.openssl-sys-0.9.60.bazel- data = glob(["**"]) + [
raze/remote/BUILD.openssl-sys-0.9.60.bazel- "@openssl",
raze/remote/BUILD.openssl-sys-0.9.60.bazel- ],
raze/remote/BUILD.openssl-sys-0.9.60.bazel- # / MODIFIED MANUALLY #
raze/remote/BUILD.openssl-sys-0.9.60.bazel- edition = "2015",They correspond to:
- adding data to the build script of a crate (would need a new Cargo.toml raze
meta.package.*attribute) - adding env vars to the build script of a crate (would need a new Cargo.toml raze
meta.package.*attribute) - the
linksattribute which needs to be parsed from theCargo.toml
We do need this openssl example to be tested here in rules_rust so we need to keep the manual changes around for now.
There was a problem hiding this comment.
Here are relevant issues on cargo-raze:
There was a problem hiding this comment.
Hey, you should also take a look at google/cargo-raze#343 and (now successfully building) google/cargo-raze#340. google/cargo-raze#340 builds openssl-sys, libgit2-sys, libssh2-sys, and curl-sys in order to successfully build cargo-raze with Bazel.
There was a problem hiding this comment.
Oh that's great, one nice step forwards!
There was a problem hiding this comment.
Note that we'll still be missing another couple of attributes so maybe we can merge the changes are they are now and "razificate" in subsequent PRs? I unfortunately don't have too much spare time at the moment...
There was a problem hiding this comment.
I think so long as everything is locked, merging should be fine. Then it's simply a matter of making sure cargo-raze can generate BUILD files with the same information.
Added a lockfile and updated the Cargo.toml with cargo-raze 0.8 stanzas. Then, re-generated build files with raze `0.8.0`, using `cargo raze` in the example directory. Finally, a couple of attributes needed to be set manually because cargo-raze doesn't support them yet. One can grep for "MODIFIED MANUALLY" in the generated BUILD files.
sitaktif
force-pushed
the
complex-sys-raze-0.8
branch
from
b4086a0 to
9fc9493
Compare
Added a lockfile and updated the Cargo.toml with cargo-raze 0.8 stanzas.
Then, re-generated build files with raze
0.8.0, usingcargo razeinthe example directory.
CC @UebelAndre as a follow-up to #480 (comment)