diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch | 32 |
2 files changed, 26 insertions, 18 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 3fa2919ab..cbcefb60e 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -47,7 +47,7 @@ epoch=1 pkgver=80.0 pkgrel=1 pkgrel+=.parabola1 -_brandingver=77.0 +_brandingver=80.0 _brandingrel=1 pkgdesc="Standalone web browser derived from Mozilla Firefox" arch=(x86_64) @@ -82,15 +82,15 @@ sha256sums=('380d9853e0712442ba2d4acd85c0e09c19ad36561a3ea8932705ad6b8a91146a' 'SKIP' '3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75' '44be8e819b8334ed36e9410d62dbc6c16dd8f8329a191403bfdce3cf2e9181fc') -sha256sums+=('57ea7663a8bf3d9326cf17798db0846b987bd26f4a20670d9aa3a02a58a29471' +sha256sums+=('228b7d316ab6836a6e69aa7070033b1ae073f3579474a49d8c306702b1c1413e' 'SKIP' '5cfcadbd168c52b1b1e3f2f2c45911a4ae1a9d8a05918be68475a31985607bd8' '0ed6b8efa00f73a96bceaba2d6a31fb11d416106729ab9b8289b191eb9acccfa' '714998c5fc379f54a66ff80a845b7880169cd5b4094b77b719a99d33b65c0940') -sha256sums_i686=('bf2829f280ef05a608584ce7ec95875e147f315bac9609f5e18052bc03e3c4f9' - 'cff239cbeca6fb6171ed4849b6b42173ce6b4fd2f671e1d5dedd1d81795f3da8') sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966' '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') +sha256sums_i686=('bf2829f280ef05a608584ce7ec95875e147f315bac9609f5e18052bc03e3c4f9' + 'e661665ee00ecec66c33e115b0af3474452022f0d8ceda634a6315dc8cb99014') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com> validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger @@ -182,11 +182,13 @@ END ;; i686) # disable LTO and use gcc toolchain (clang has issues on IA32) + # disable SIMD (SSE20 for i686) export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE" cat >>../mozconfig <<END ac_add_options --disable-linker=lld ac_add_options --enable-linker=bfd ac_add_options --disable-lto +ac_add_options --disable-rust-simd export CC=gcc export CXX=g++ export AR=gcc-ar @@ -362,7 +364,7 @@ build() { i686) # disable LTO (clang has issues on IA32) export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off" - export LDFLAGS+=" -Wl,--no-keep-memory" + export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" # libvpx has some hard-coded compiler flags for MMX, SSE, SSE2, use the correct one # per CARCH (75.0 uses an intrisic _mm_empty now, which required the corresponding 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 7bcbde2a8..95c2df7e5 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,27 +1,33 @@ ---- 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 @@ +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 # the chance of proxy bypasses originating from rust code. - # The check only works when rust code is built with -Clto. + # 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. -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 -+#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 +-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) |