From e4eb6367871b1c1a531939c17ffa92dbc3913dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 6 Apr 2021 00:01:11 -0300 Subject: [PATCH 1/2] firefox: fix broken for i686. (and other 32bit native builds) --- srcpkgs/firefox/template | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index a8ba08719eb4..148d76eb47dc 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -30,23 +30,21 @@ conflicts="firefox-esr>=0" build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland" build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland" +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" +fi + case $XBPS_TARGET_MACHINE in armv[56]*) broken="required NEON extensions are not supported on armv6" ;; ppc64*) ;; ppc*) broken="xptcall bitrot" ;; esac -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - # work around large debug symbols on 32-bit hosts -# cargo:warning=cc1plus: out of memory allocating 65536 bytes after a total of 1010126848 bytes +# is out of memory or sometimes out of address space if [ "$XBPS_WORDSIZE" = "32" ]; then nodebug=yes -fi - -if [ "$XBPS_TARGET_MACHINE" = i686 ]; then + # XXX: try again for new version broken="out of memory allocating 65536 bytes after a total of 1181696000 bytes" fi From fb69e8339ceeb105656b121d4097f5f2ed479d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 6 Apr 2021 00:01:43 -0300 Subject: [PATCH 2/2] removed-packages: add firefox for i686. This is the only arch where the builders are 32-bit, and it's where the build runs out of memory. Firefox is probably high profile enough that we shouldn't let it sit out of date in people's systems. --- srcpkgs/removed-packages/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 79e7c4d1c77e..230e2dd05a21 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=40 +revision=41 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -317,4 +317,9 @@ case "$XBPS_TARGET_MACHINE" in gcc-go-tools<=10.2.1pre1_1 " ;; + i686*) + replaces+=" + firefox<=86.0.1_1 + " + ;; esac