commit: 66c428c613d510ea9676a463067106612da92c57 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Fri Jul 17 16:07:43 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Jul 17 17:16:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c428c6
www-client/firefox: non-ESR: unbreak build with >=rust-1.45.0 Link: https://bugzilla.mozilla.org/show_bug.cgi?id=1640982 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> www-client/firefox/firefox-78.0.2.ebuild | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/www-client/firefox/firefox-78.0.2.ebuild b/www-client/firefox/firefox-78.0.2.ebuild index 533c4da067c..1fcb4d3a725 100644 --- a/www-client/firefox/firefox-78.0.2.ebuild +++ b/www-client/firefox/firefox-78.0.2.ebuild @@ -351,6 +351,13 @@ src_prepare() { sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \ "${S}"/build/moz.configure/rust.configure || die + if has_version ">=virtual/rust-1.45.0" ; then + einfo "Unbreak build with >=rust-1.45.0, bmo#1640982 ..." + sed -i \ + -e 's/\(^cargo_rustc_flags +=.* \)-Clto\( \|$\)/\1/' \ + "${S}/config/makefiles/rust.mk" || die + fi + # Autotools configure is now called old-configure.in # This works because there is still a configure.in that happens to be for the # shell wrapper configure script
