summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrizzlyuser <grizzlyuser@protonmail.com>2020-07-02 20:38:30 +0300
committerAndreas Grapentin <andreas@grapentin.org>2020-07-10 11:28:47 +0200
commit6adb656f5da10cae77f9098601a122f45a889a7f (patch)
tree88971890c25680216c46ac22f7d645b6bbf78a41
parent9b8b71b259ccdd74d1dcba18e977228d0b6b4f62 (diff)
libre/iceweasel: update i686 patches for 78.0.1
Signed-off-by: Andreas Grapentin <andreas@grapentin.org>
-rw-r--r--libre/iceweasel/avoid-libxul-OOM-python-check.patch4
-rw-r--r--libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/libre/iceweasel/avoid-libxul-OOM-python-check.patch b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
index 85f32ffba..89fa3f384 100644
--- a/libre/iceweasel/avoid-libxul-OOM-python-check.patch
+++ b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
@@ -5,8 +5,8 @@ diff -rauN a/config/rules.mk b/config/rules.mk
$(RM) $@
endif
$(MKSHLIB) $($@_OBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
-- $(call py3_action,check_binary,--target $@)
-+# $(call py3_action,check_binary,--target $@)
+- $(call py_action,check_binary,--target $@)
++# $(call py_action,check_binary,--target $@)
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
ifdef MSMANIFEST_TOOL
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 76e12ed63..a35a8b732 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
@@ -10,7 +10,7 @@ index df11844..6f75d0a 100644
-ifeq ($(OS_ARCH), Linux)
-ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
-ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-- $(call py3_action,check_binary,--target --networking $@)
+- $(call py_action,check_binary,--target --networking $@)
-endif
-endif
-endif
@@ -19,7 +19,7 @@ index df11844..6f75d0a 100644
+# ifeq ($(OS_ARCH), Linux)
+# ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
+# ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-+# $(call py3_action,check_binary,--target --networking $@)
++# $(call py_action,check_binary,--target --networking $@)
+# endif
+# endif
+# endif