diff options
Diffstat (limited to 'source/xap/mozilla-firefox')
-rw-r--r-- | source/xap/mozilla-firefox/firefox.rust-1.45.diff | 14 | ||||
-rwxr-xr-x | source/xap/mozilla-firefox/mozilla-firefox.SlackBuild | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/source/xap/mozilla-firefox/firefox.rust-1.45.diff b/source/xap/mozilla-firefox/firefox.rust-1.45.diff new file mode 100644 index 00000000..fe9e7441 --- /dev/null +++ b/source/xap/mozilla-firefox/firefox.rust-1.45.diff @@ -0,0 +1,14 @@ +--- ./config/makefiles/rust.mk.orig 2020-07-08 06:51:15.000000000 -0500 ++++ ./config/makefiles/rust.mk 2020-07-24 12:23:31.769077708 -0500 +@@ -61,7 +61,11 @@ + # Enable link-time optimization for release builds, but not when linking + # gkrust_gtest. + ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) ++# Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true ++# for newer ones that support it. Combining the latter with -Clto works, so ++# set both everywhere. + cargo_rustc_flags += -Clto ++export CARGO_PROFILE_RELEASE_LTO=true + endif + endif + endif diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index c8e20e3c..1001713b 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -198,6 +198,9 @@ zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 # Fix building with latest Rust: zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1 +# Again, fix building with latest Rust: +zcat $CWD/firefox.rust-1.45.diff.gz | patch -p1 --verbose || exit 1 + # Fetch localization, if requested # https://bugzilla.mozilla.org/show_bug.cgi?id=1256955 if [ ! -z $MOZLOCALIZE ]; then |