summaryrefslogtreecommitdiff
path: root/libre/iceweasel/avoid-libxul-OOM-python-check.patch
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2023-10-27 23:51:05 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2023-10-29 02:30:18 -0400
commitc64587c69b5f5e38e82ac0482e9eeda2b8a57bb8 (patch)
tree79935b5cf9d0216c4ca55f62453b02e31fced54c /libre/iceweasel/avoid-libxul-OOM-python-check.patch
parent0a4b48ee526d74859762a8f4545bbaeebccd38e5 (diff)
[iceweasel]: tweak for i686 - FTBS
Diffstat (limited to 'libre/iceweasel/avoid-libxul-OOM-python-check.patch')
-rw-r--r--libre/iceweasel/avoid-libxul-OOM-python-check.patch16
1 files changed, 7 insertions, 9 deletions
diff --git a/libre/iceweasel/avoid-libxul-OOM-python-check.patch b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
index 01d6f98d4..00b9367d5 100644
--- a/libre/iceweasel/avoid-libxul-OOM-python-check.patch
+++ b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
@@ -1,8 +1,6 @@
-diff --git a/config/rules.mk b/config/rules.mk
-index f1eb7fd..609e720 100644
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -422,7 +422,7 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
+--- a/config/rules.mk 2023-10-19 15:54:27.000000000 -0400
++++ b/config/rules.mk 2023-10-27 23:34:05.712105387 -0400
+@@ -422,7 +422,7 @@
$(LINKER) -OUT:$@ -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
else # !WINNT || GNU_CC
$(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
@@ -11,7 +9,7 @@ index f1eb7fd..609e720 100644
endif # WINNT && !GNU_CC
ifdef ENABLE_STRIP
-@@ -463,7 +463,7 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
+@@ -463,7 +463,7 @@
$(LINKER) -out:$@ -pdb:$(LINK_PDBFILE) $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
else
$(call EXPAND_CC_OR_CXX,$@) $(COMPUTED_CXX_LDFLAGS) -o $@ $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
@@ -20,12 +18,12 @@ index f1eb7fd..609e720 100644
endif # WINNT && !GNU_CC
ifdef ENABLE_STRIP
-@@ -524,7 +524,7 @@ $(SHARED_LIBRARY): $(OBJS) $(call resfile,$(SHARED_LIBRARY)) $(STATIC_LIBS) $(EX
+@@ -524,7 +524,7 @@
$(REPORT_BUILD)
$(RM) $@
- $(MKSHLIB) $($@_OBJS) $(filter %.res,$^) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
+ $(MKSHLIB) $($@_OBJS) $(filter %.res,$^) $(RELRHACK_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
- $(call py_action,check_binary,$@)
-+# $(call py_action,check_binary,$@)
++ #$(call py_action,check_binary,$@)
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
endif # WINNT && !GCC