Closed rubdos closed 2 years ago
@xfade / @lbt , any chance this could get some love? This is literally the only thing that withholds Whisperfish from building with Jolla's Rust.
@rainemak opinion?
This should be smoke tested with Sailfish core (i.e. rust + xulrunner-qt5).
Can you create the patch properly similar to the other patches? E.g. author, sign of, subject and description?
Done. Would you like me to squash them together?
Also, when you guys run git format-patch
, on what repository do you do that? I had to manually fiddle a bit with the paths, but that feels very dirty. I'm not very used to the format-patch
stuff :-)
Done. Would you like me to squash them together? Yes please.
Also, when you guys run
git format-patch
, on what repository do you do that? I had to manually fiddle a bit with the paths, but that feels very dirty. I'm not very used to theformat-patch
stuff :-)
You can ether use the submodule or a separate git repository. I usually use a separate git repository, branch of the upstream version and apply our patches on top and then create the patch files like this:
git format-patch --no-numbered --zero-commit --full-index --no-signature --output-directory=$pkgdir/rpm
All those options reduce the noise when creating patch files to a minimum when we rebase them.
Kind reminder :-)
If there's anything left that I should fix, please do let me know!
This should be smoke tested with Sailfish core (i.e. rust + xulrunner-qt5).
It seems this does not cause any new issues with those, so it should be fine.
cargo
should also know about theSB2_RUST_TARGET_TRIPLE
variable, becausecargo
can conditionally add or remove dependencies based on target information. For example,polyval
and other cryptographic crates likesha-1
andsha2
have statements like this:This can lead to very strange errors, because a dependency that is stated in Cargo.toml does not get injected in the build process.
This is a blocker for Whisperfish to be build with the SailfishOS SDK, especially now that Rust 1.52 is available!
I don't know to what extend this should be a real
format-patch
/e-mail style patch for Jolla to accept this here, let me know if I should clean that up a little.PS., I had a 1.51 branch laying around, seems like you folks had to duplicate my efforts. Sorry for not notifying you!