diff options
Diffstat (limited to 'libre/iceweasel')
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 7 | ||||
| -rw-r--r-- | libre/iceweasel/avoid-libxul-OOM-python-check.patch | 26 | ||||
| -rw-r--r-- | libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch | 26 |
3 files changed, 38 insertions, 21 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 3e3cef997..0d5803cdc 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -89,8 +89,8 @@ sha256sums=('12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713' '069f093e7aceec210b17472b65a26de6c926a50aeb3c413e532a8ec3742cf09c' '0ed6b8efa00f73a96bceaba2d6a31fb11d416106729ab9b8289b191eb9acccfa' '714998c5fc379f54a66ff80a845b7880169cd5b4094b77b719a99d33b65c0940') -sha256sums_i686=('125000a8d4eec602d51eebcb9c94fb48c3ec1f5162ea28116bfdfe14d1a34cf9' - '6395b7e349963c9a689929b44525159328954af156ef0b9a42182e7e16baa8ba') +sha256sums_i686=('bf2829f280ef05a608584ce7ec95875e147f315bac9609f5e18052bc03e3c4f9' + 'cff239cbeca6fb6171ed4849b6b42173ce6b4fd2f671e1d5dedd1d81795f3da8') sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966' '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com> @@ -185,7 +185,8 @@ END # disable LTO and use gcc toolchain (clang has issues on IA32) export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE" cat >>../mozconfig <<END -ac_add_options --disable-rust-simd +ac_add_options --disable-linker=lld +ac_add_options --enable-linker=bfd ac_add_options --disable-lto export CC=gcc export CXX=g++ diff --git a/libre/iceweasel/avoid-libxul-OOM-python-check.patch b/libre/iceweasel/avoid-libxul-OOM-python-check.patch index 89fa3f384..04ce4958e 100644 --- a/libre/iceweasel/avoid-libxul-OOM-python-check.patch +++ b/libre/iceweasel/avoid-libxul-OOM-python-check.patch @@ -1,7 +1,25 @@ -diff -rauN a/config/rules.mk b/config/rules.mk ---- a/config/rules.mk 2020-04-04 12:24:34.837582901 +0200 -+++ b/config/rules.mk 2020-04-04 12:26:14.227584517 +0200 -@@ -608,7 +608,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 @@ + endif # MSVC with manifest tool + 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 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 + 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 py_action,check_binary,--target $@) ++# $(call py_action,check_binary,--target $@) + endif # WINNT && !GNU_CC + + ifdef ENABLE_STRIP +@@ -606,7 +606,7 @@ $(RM) $@ endif $(MKSHLIB) $($@_OBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) 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 a35a8b732..7bcbde2a8 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,8 +1,6 @@ -diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk -index df11844..6f75d0a 100644 ---- a/config/makefiles/rust.mk -+++ b/config/makefiles/rust.mk -@@ -299,15 +299,15 @@ $(RUST_LIBRARY_FILE): force-cargo-library-build +--- firefox-79.0/config/makefiles/rust.mk 2020-07-21 00:49:36.000000000 +0200 ++++ firefox-79.0-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk 2020-08-02 13:56:36.118444982 +0200 +@@ -299,15 +299,15 @@ # the chance of proxy bypasses originating from rust code. # The check only works when rust code is built with -Clto. # Sanitizers and sancov also fail because compiler-rt hooks network functions. @@ -15,15 +13,15 @@ index df11844..6f75d0a 100644 -endif -endif -endif -+# ifndef MOZ_PROFILE_GENERATE -+# ifeq ($(OS_ARCH), Linux) -+# ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) -+# ifneq (,$(filter -Clto,$(cargo_rustc_flags))) -+# $(call py_action,check_binary,--target --networking $@) -+# endif -+# endif -+# endif -+# endif ++#ifndef MOZ_PROFILE_GENERATE ++#ifeq ($(OS_ARCH), Linux) ++#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) ++#ifneq (,$(filter -Clto,$(cargo_rustc_flags))) ++# $(call py_action,check_binary,--target --networking $@) ++#endif ++#endif ++#endif ++#endif force-cargo-library-check: $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag) |