diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 19:11:47 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 19:11:47 +0000 |
| commit | defca1226f4258b7d4793568ab817e62c558b235 (patch) | |
| tree | 8f6dac97c81343accfc854890dbd15f1dcf3ad6e /experimental/firefox-esr/rust-1.33.0.patch | |
| parent | 7cbc839eac40d61bf115994f2448af7fb48d0316 (diff) | |
| parent | 37cd8e9274bb1112ff85d170bc7c87e582d7baaa (diff) | |
| download | packages-defca1226f4258b7d4793568ab817e62c558b235.tar.gz packages-defca1226f4258b7d4793568ab817e62c558b235.tar.bz2 packages-defca1226f4258b7d4793568ab817e62c558b235.tar.xz packages-defca1226f4258b7d4793568ab817e62c558b235.zip | |
Merge branch 'firefox-esr-60' into 'master'
Bump and fix experimental/firefox-esr
This MR bumps experimental/firefox-esr to 60.6.1 ESR (the latest release at this time), and updates the LLVM dependency to LLVM 7. Two new patches are required: the first fixes for building with Rust 1.33.0, as the build will fail due to undocumented macros, which I believe is a change in the behaviour of the `deny_docs` compiler pragma from 1.31.x; the second (courtesy of @aranea) fixes mozbuild to actually disable the profiling code when the `--disable-profiling` flag is passed in `mozconfig`, which otherwise fails to compile due to musl incompatibility.
Build succeeds on `x86_64` with beta3 Rust and on `aarch64` with beta2 Rust. Resulting package appears to work on both platforms, as my test boxen could both load https://adelielinux.org and play youtube videos.
See merge request !221
Diffstat (limited to 'experimental/firefox-esr/rust-1.33.0.patch')
| -rw-r--r-- | experimental/firefox-esr/rust-1.33.0.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/experimental/firefox-esr/rust-1.33.0.patch b/experimental/firefox-esr/rust-1.33.0.patch new file mode 100644 index 000000000..d74ade170 --- /dev/null +++ b/experimental/firefox-esr/rust-1.33.0.patch @@ -0,0 +1,26 @@ +Fix build error resulting from missing macro documentation when building with +rust 1.33.0. + +diff -urw firefox-60.6.1-old/servo/components/style/lib.rs firefox-60.6.1/servo/components/style/lib.rs +--- firefox-60.6.1-old/servo/components/style/lib.rs 2019-03-22 05:01:07.000000000 +0000 ++++ firefox-60.6.1/servo/components/style/lib.rs 2019-04-18 18:17:26.229986934 +0000 +@@ -23,7 +23,6 @@ + //! [cssparser]: ../cssparser/index.html + //! [selectors]: ../selectors/index.html + +-#![deny(missing_docs)] + + extern crate app_units; + extern crate arrayvec; +diff -urw firefox-60.6.1-old/servo/components/style_traits/lib.rs firefox-60.6.1/servo/components/style_traits/lib.rs +--- firefox-60.6.1-old/servo/components/style_traits/lib.rs 2019-03-22 05:01:07.000000000 +0000 ++++ firefox-60.6.1/servo/components/style_traits/lib.rs 2019-04-18 18:17:18.439987016 +0000 +@@ -9,7 +9,7 @@ + #![crate_name = "style_traits"] + #![crate_type = "rlib"] + +-#![deny(unsafe_code, missing_docs)] ++#![deny(unsafe_code)] + + extern crate app_units; + #[macro_use] extern crate bitflags; |