summaryrefslogtreecommitdiff
path: root/libre/iceweasel/avoid-libxul-OOM-python-check.patch
diff options
context:
space:
mode:
authorgrizzlyuser <grizzlyuser@protonmail.com>2020-12-30 17:00:23 +0200
committerbill-auger <mr.j.spam.me@gmail.com>2021-01-12 00:47:06 -0500
commit4449a163ea5b65de394ebf27b338c81bcd1fe093 (patch)
tree76032d5c695c736d4761d8a998b87d9f04344005 /libre/iceweasel/avoid-libxul-OOM-python-check.patch
parente7d4e45c8301b29204aab4446078d85c3c2b6632 (diff)
libre/iceweasel: 84.0.1 from upstreams, update patches
Diffstat (limited to 'libre/iceweasel/avoid-libxul-OOM-python-check.patch')
-rw-r--r--libre/iceweasel/avoid-libxul-OOM-python-check.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/libre/iceweasel/avoid-libxul-OOM-python-check.patch b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
index caefbe08f..632281134 100644
--- a/libre/iceweasel/avoid-libxul-OOM-python-check.patch
+++ b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
@@ -1,7 +1,7 @@
-diff -rauN firefox-79.0/config/rules.mk firefox-79.0-avoid-libxul-OOM-python-check-patch/config/rules.mk
---- firefox-79.0/config/rules.mk 2020-07-21 00:49:36.000000000 +0200
-+++ firefox-79.0-avoid-libxul-OOM-python-check-patch/config/rules.mk 2020-08-02 14:04:30.846204786 +0200
-@@ -470,7 +470,7 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
+diff -rauN a/config/rules.mk b/config/rules.mk
+--- a/config/rules.mk 2020-10-13 20:28:50.994026769 +0200
++++ b/config/rules.mk 2020-10-13 20:29:06.594023940 +0200
+@@ -470,7 +470,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) $(PGO_CFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
@@ -10,7 +10,7 @@ diff -rauN firefox-79.0/config/rules.mk firefox-79.0-avoid-libxul-OOM-python-che
endif # WINNT && !GNU_CC
ifdef ENABLE_STRIP
-@@ -514,7 +514,7 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
+@@ -514,7 +514,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) $(PGO_CFLAGS) -o $@ $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
@@ -19,7 +19,7 @@ diff -rauN firefox-79.0/config/rules.mk firefox-79.0-avoid-libxul-OOM-python-che
endif # WINNT && !GNU_CC
ifdef ENABLE_STRIP
-@@ -594,7 +594,7 @@ ifndef INCREMENTAL_LINKER
+@@ -594,7 +594,7 @@
$(RM) $@
endif
$(MKSHLIB) $($@_OBJS) $(filter %.res,$^) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)