summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-08-12 13:32:21 +0200
committerLars Wendler <polynomial-c@gentoo.org>2020-08-12 14:08:19 +0200
commit8d691d5aec3af36b85064c088307d49492b3abd2 (patch)
tree1c98d2f6ab638a27047e00deca302b2f7e29f304 /www-client/seamonkey
parentmedia-libs/libmatroska: Stabilize 1.6.2 sparc, #736796 (diff)
downloadgentoo-8d691d5aec3af36b85064c088307d49492b3abd2.tar.gz
gentoo-8d691d5aec3af36b85064c088307d49492b3abd2.tar.bz2
gentoo-8d691d5aec3af36b85064c088307d49492b3abd2.zip
www-client/seamonkey: Use upstream rust-1.45 patch
Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'www-client/seamonkey')
-rw-r--r--www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch26
-rw-r--r--www-client/seamonkey/seamonkey-2.53.3.ebuild5
2 files changed, 18 insertions, 13 deletions
diff --git a/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch b/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch
index e2c6aa20161..8aee245ef18 100644
--- a/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch
+++ b/www-client/seamonkey/files/seamonkey-2.53.3-rust-1.45.0.patch
@@ -1,15 +1,23 @@
---- seamonkey-2.53.3/mozilla/config/rules.mk
-+++ seamonkey-2.53.3/mozilla/config/rules.mk
-@@ -871,12 +871,6 @@
+--- a/mozilla/config/rules.mk
++++ b/mozilla/config/rules.mk
+@@ -870,16 +870,20 @@ endif
+
# These flags are passed via `cargo rustc` and only apply to the final rustc
# invocation (i.e., only the top-level crate, not its dependencies).
cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
--ifndef DEVELOPER_OPTIONS
--ifndef MOZ_DEBUG_RUST
--# Enable link-time optimization for release builds.
--cargo_rustc_flags += -C lto
--endif
--endif
+ ifndef DEVELOPER_OPTIONS
+ ifndef MOZ_DEBUG_RUST
+ # Enable link-time optimization for release builds.
+ cargo_rustc_flags += -C lto
++# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when using -Clto.
++ifeq (,$(filter 1.3% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
++RUSTFLAGS += -Cembed-bitcode=yes
++endif
+ endif
+ endif
rustflags_override = RUSTFLAGS='$(MOZ_RUST_DEFAULT_FLAGS) $(RUSTFLAGS)'
+ ifdef MOZ_MSVCBITS
+ # If we are building a MozillaBuild shell, we want to clear out the
+ # vcvars.bat environment variables for cargo builds. This is because
diff --git a/www-client/seamonkey/seamonkey-2.53.3.ebuild b/www-client/seamonkey/seamonkey-2.53.3.ebuild
index c81cbe49b6a..b05ff561d50 100644
--- a/www-client/seamonkey/seamonkey-2.53.3.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.3.ebuild
@@ -189,10 +189,7 @@ src_prepare() {
edos2unix "${file}"
done
- if has_version ">=virtual/rust-1.45.0" ; then
- einfo "Unbreak build with >=rust-1.45.0, bmo#1640982 ..."
- eapply "${FILESDIR}/${PN}-2.53.3-rust-1.45.0.patch"
- fi
+ eapply "${FILESDIR}/${PN}-2.53.3-rust-1.45.0.patch"
# Allow user to apply any additional patches without modifing ebuild
eapply_user