summaryrefslogtreecommitdiff
path: root/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
diff options
context:
space:
mode:
authorgrizzlyuser <grizzlyuser@protonmail.com>2021-01-28 10:34:13 +0200
committerbill-auger <mr.j.spam.me@gmail.com>2021-01-28 14:22:27 -0500
commit67ce96d641bc2440dfc4a2e716bfdd4a604d8060 (patch)
tree709b66e9585c97c0f07866d73f7c4ab422a16f7f /libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
parenteeba2484371362a7a90ce0673c3ed88eecd51cec (diff)
libre/iceweasel: upgrade to v85.0
Update according to upstream changes, including from i686. Libre patching of onboarding cards not needed anymore as removed upstream [1]. Fix minor typo in Remote Settings patch. Fix path in _check_build_config() in PKGBUILD. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1675127
Diffstat (limited to 'libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch')
-rw-r--r--libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
index 81d536cd9..c9ae89cb4 100644
--- a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
+++ b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
@@ -1,7 +1,7 @@
diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk
--- a/config/makefiles/rust.mk 2020-10-13 20:23:09.920635480 +0200
+++ b/config/makefiles/rust.mk 2020-10-13 20:24:02.273994137 +0200
-@@ -310,17 +310,17 @@
+@@ -324,17 +324,17 @@
# the chance of proxy bypasses originating from rust code.
# The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
# Sanitizers and sancov also fail because compiler-rt hooks network functions.
@@ -19,7 +19,7 @@ diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk
+#ifndef MOZ_PROFILE_GENERATE
+#ifeq ($(OS_ARCH), Linux)
+#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
-+#ifndef MOZ_LTO_RUST_CROSS
++#ifndef MOZ_LTO_RUST
+#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
+# $(call py_action,check_binary,--target --networking $@)
+#endif