diff options
| -rw-r--r-- | extra/firefox/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/firefox/avoid-libxul-OOM-python-check.patch | 22 | ||||
| -rw-r--r-- | extra/firefox/rust-static-disable-network-test-on-static-libraries.patch | 31 |
3 files changed, 31 insertions, 30 deletions
diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD index 6adaa234..fe7b629c 100644 --- a/extra/firefox/PKGBUILD +++ b/extra/firefox/PKGBUILD @@ -1,6 +1,6 @@ # disable LTO as it has little benefit and uses too many resources # don't compile with clang, use gcc toolchain (clang has issues on IA32) -# disable SIMD (SSE20 for i686 +# disable SIMD (SSE2 for i686) # set correct compiler and toochain tools if [ "${CARCH}" = "pentium4" ]; then source+=('mozconfig-pentium4.patch') @@ -22,6 +22,8 @@ eval "$( ' )" fi + +# try hard to tell ld and rust not to use too much memory (no lto, no debug info, etc.) eval "$( declare -f build | \ sed ' @@ -125,7 +127,7 @@ eval "$( # test failure in rust code (complaining about network functions) when PGO is used, # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757 source+=('rust-static-disable-network-test-on-static-libraries.patch') -sha256sums+=('e661665ee00ecec66c33e115b0af3474452022f0d8ceda634a6315dc8cb99014') +sha256sums+=('bd55e25fbaf36bb9d01198024930e3a1a275533ffd6c142b3be70bfbc33b4577') eval "$( declare -f prepare | \ sed ' @@ -145,7 +147,7 @@ eval "$( # readelf: Error: Unable to seek to 0x801db328 for section headers source+=('avoid-libxul-OOM-python-check.patch') -sha256sums+=('bf2829f280ef05a608584ce7ec95875e147f315bac9609f5e18052bc03e3c4f9') +sha256sums+=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353') eval "$( declare -f prepare | \ sed ' diff --git a/extra/firefox/avoid-libxul-OOM-python-check.patch b/extra/firefox/avoid-libxul-OOM-python-check.patch index 04ce4958..63228113 100644 --- a/extra/firefox/avoid-libxul-OOM-python-check.patch +++ b/extra/firefox/avoid-libxul-OOM-python-check.patch @@ -1,30 +1,30 @@ -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 +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 @@ - endif # MSVC with manifest tool + $(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) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS) + $(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) - $(call py_action,check_binary,--target $@) +# $(call py_action,check_binary,--target $@) endif # WINNT && !GNU_CC ifdef ENABLE_STRIP -@@ -526,7 +526,7 @@ - endif # MSVC with manifest tool +@@ -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) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS) + $(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) - $(call py_action,check_binary,--target $@) +# $(call py_action,check_binary,--target $@) endif # WINNT && !GNU_CC ifdef ENABLE_STRIP -@@ -606,7 +606,7 @@ +@@ -594,7 +594,7 @@ $(RM) $@ endif - $(MKSHLIB) $($@_OBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) + $(MKSHLIB) $($@_OBJS) $(filter %.res,$^) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) - $(call py_action,check_binary,--target $@) +# $(call py_action,check_binary,--target $@) ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - ifdef MSMANIFEST_TOOL + endif # WINNT && !GCC diff --git a/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch b/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch index 95c2df7e..ba9e98c3 100644 --- a/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch +++ b/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch @@ -1,8 +1,7 @@ -diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk -index 58606db50f..9c4d5b9279 100644 ---- a/config/makefiles/rust.mk -+++ b/config/makefiles/rust.mk -@@ -305,17 +305,17 @@ $(RUST_LIBRARY_FILE): force-cargo-library-build +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 @@ # 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. # Sanitizers and sancov also fail because compiler-rt hooks network functions. @@ -17,17 +16,17 @@ index 58606db50f..9c4d5b9279 100644 -endif -endif -endif -+# ifndef MOZ_PROFILE_GENERATE -+# ifeq ($(OS_ARCH), Linux) -+# ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) -+# ifndef MOZ_LTO_RUST -+# ifneq (,$(filter -Clto,$(cargo_rustc_flags))) -+# $(call py_action,check_binary,--target --networking $@) -+# endif -+# endif -+# endif -+# endif -+# endif ++#ifndef MOZ_PROFILE_GENERATE ++#ifeq ($(OS_ARCH), Linux) ++#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) ++#ifndef MOZ_LTO_RUST ++#ifneq (,$(filter -Clto,$(cargo_rustc_flags))) ++# $(call py_action,check_binary,--target --networking $@) ++#endif ++#endif ++#endif ++#endif ++#endif force-cargo-library-check: $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag) |