summaryrefslogtreecommitdiff
path: root/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
diff options
context:
space:
mode:
authorgrizzlyuser <grizzlyuser@protonmail.com>2020-05-06 23:36:25 +0300
committerAndreas Grapentin <andreas@grapentin.org>2020-05-12 22:15:02 +0200
commit4ab3fd7ba85ce601afec2843dda54df3f5d14ee8 (patch)
treea3da7dae1853adae27962799374aa24604d1a774 /libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
parent1a1e1060ca6958cbc8b67d88ed3dd4292a01816e (diff)
libre/iceweasel: update patches
Signed-off-by: Andreas Grapentin <andreas@grapentin.org>
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.patch12
1 files changed, 6 insertions, 6 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 f5e0f6a0a..bece16a04 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 firefox-72.0.1/config/makefiles/rust.mk firefox-72.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk
---- firefox-72.0.1/config/makefiles/rust.mk 2020-01-08 02:23:30.000000000 +0100
-+++ firefox-72.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk 2020-01-10 12:17:40.172666172 +0100
-@@ -292,17 +292,17 @@
+diff -rauN firefox-74.0.1/config/makefiles/rust.mk firefox-74.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk
+--- firefox-74.0.1/config/makefiles/rust.mk 2020-04-03 13:10:23.000000000 +0200
++++ firefox-74.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk 2020-04-04 12:31:27.804227950 +0200
+@@ -283,17 +283,17 @@
# the chance of proxy bypasses originating from rust code.
# The check only works when rust code is built with -Clto.
# Enabling sancov or TSan also causes this to fail.
@@ -10,7 +10,7 @@ diff -rauN firefox-72.0.1/config/makefiles/rust.mk firefox-72.0.1-rust-static-di
-ifeq ($(OS_ARCH), Linux)
-ifeq (,$(rustflags_sancov))
-ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-- $(call py_action,check_binary,--target --networking $@)
+- $(call py3_action,check_binary,--target --networking $@)
-endif
-endif
-endif
@@ -21,7 +21,7 @@ diff -rauN firefox-72.0.1/config/makefiles/rust.mk firefox-72.0.1-rust-static-di
+#ifeq ($(OS_ARCH), Linux)
+#ifeq (,$(rustflags_sancov))
+#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-+# $(call py_action,check_binary,--target --networking $@)
++# $(call py3_action,check_binary,--target --networking $@)
+#endif
+#endif
+#endif