Icecat patches

  • Done
  • quality assurance status badge
Details
3 participants
  • Clément Lassieur
  • ng0
  • Marius Bakke
Owner
unassigned
Submitted by
Clément Lassieur
Severity
important
C
C
C
Clément Lassieur wrote on 4 Apr 2017 16:08
[PATCH 1/2] gnu: icecat: Use bundled ICU to avoid crashes.
(address . 26361@debbugs.gnu.org)
20170404140808.22719-1-clement@lassieur.org
gnu/packages/gnuzilla.scm (icecat)[arguments] <#:configure-flags>:
Temporarily comment out "--with-system-icu".
---
gnu/packages/gnuzilla.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

Toggle diff (27 lines)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 76a65f09e..adf72e41e 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -509,7 +510,11 @@ standards.")
"--with-system-jpeg" ; must be libjpeg-turbo
"--with-system-libevent"
"--with-system-libvpx"
- "--with-system-icu"
+
+ ;; FIXME: It is preferable to build with system
+ ;; libraries, but this fixes crashes.
+ ;; "--with-system-icu"
+
"--with-system-nspr"
"--with-system-nss"
"--enable-system-pixman"
--
2.11.0
C
C
Clément Lassieur wrote on 4 Apr 2017 16:08
[PATCH 2/2] gnu: icecat: Re-enable parallel build.
(address . 26361@debbugs.gnu.org)
20170404140808.22719-2-clement@lassieur.org
gnu/packages/gnuzilla.scm (icecat)[arguments]: Re-enable parallel build.
---
gnu/packages/gnuzilla.scm | 1 -
1 file changed, 1 deletion(-)

Toggle diff (14 lines)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index adf72e41e..74063cfb7 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -473,7 +473,6 @@ standards.")
(arguments
`(#:tests? #f ; no check target
#:out-of-source? #t ; must be built outside of the source directory
- #:parallel-build? #f
;; XXX: There are RUNPATH issues such as
;; $prefix/lib/icecat-31.6.0/plugin-container NEEDing libmozalloc.so,
--
2.11.0
C
C
Clément Lassieur wrote on 4 Apr 2017 16:51
control message for bug #26361
(address . control@debbugs.gnu.org)
87k2702pl6.fsf@lassieur.org
severity 26361 important
C
C
Clément Lassieur wrote on 4 Apr 2017 19:12
Re: bug#26361: [PATCH 1/2] gnu: icecat: Use bundled ICU to avoid crashes.
(address . 26361@debbugs.gnu.org)
87h9242j2d.fsf@lassieur.org
Toggle quote (1 lines)
> gnu/packages/gnuzilla.scm (icecat)[arguments] <#:configure-flags>:
^
I forgot the * here. I'll add it when I push. Same with the other
patch.

Toggle quote (31 lines)
> Temporarily comment out "--with-system-icu".

> ---
> gnu/packages/gnuzilla.scm | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
> index 76a65f09e..adf72e41e 100644
> --- a/gnu/packages/gnuzilla.scm
> +++ b/gnu/packages/gnuzilla.scm
> @@ -5,6 +5,7 @@
> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
> +;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -509,7 +510,11 @@ standards.")
> "--with-system-jpeg" ; must be libjpeg-turbo
> "--with-system-libevent"
> "--with-system-libvpx"
> - "--with-system-icu"
> +
> + ;; FIXME: It is preferable to build with system
> + ;; libraries, but this fixes crashes.
> + ;; "--with-system-icu"
> +
> "--with-system-nspr"
> "--with-system-nss"
> "--enable-system-pixman"
M
M
Marius Bakke wrote on 4 Apr 2017 19:18
Re: bug#26361: Icecat patches
(name . Andreas Enge)(address . andreas@enge.fr)
878tngay6d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me
Clément Lassieur <clement@lassieur.org> writes:

Toggle quote (7 lines)
> The first patch fixes the crash (see
> http://lists.gnu.org/archive/html/guix-devel/2017-04/msg00091.html).
>
> The second re-enables parallel build. I don't know why it was
> disabled. Andreas, please comment if you think it should not be
> re-enabled :)

I can confirm that these two patches work for me. No crashes so far, and
*much* faster build time. I'd say ship it :)
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljj1XsACgkQoqBt8qM6
VPrblggAuIC7pRT6PE/pPMNTaBI1McBbAxjXKZwaEU8RgbX+g9rSFI4bBE3nwF0X
QKN03TBg3y9sL0szLUvou9ITvSkuzkDKHV8IPIvWYe1GRGIoFqvB+r8WxVb8ImmM
HOfoLyeep98BQEBxT2j4zCPw9tiXvLn+3pZHptnMuYHcr2CRtW2W72mMlErUIi+O
LEwPvgQhpy/IHcXorMxiKD+ZCiB0r4PYHKy+lR33FFV9oRJN18TRdgJgMVNfc2JX
38wKAnnar/ZR/0zI7rVZl2fl6B6m2YETjVMTkuOG67n2C3BrD1zATdJaNm/JPmi/
W+4Z+s6pJL9P2pSFqShsZaL/ZWVBCg==
=vuuq
-----END PGP SIGNATURE-----

C
C
Clément Lassieur wrote on 4 Apr 2017 20:23
(name . Marius Bakke)(address . mbakke@fastmail.com)
87mvbwc9qo.fsf@lassieur.org
Marius Bakke <mbakke@fastmail.com> writes:

Toggle quote (12 lines)
> Clément Lassieur <clement@lassieur.org> writes:
>
>> The first patch fixes the crash (see
>> http://lists.gnu.org/archive/html/guix-devel/2017-04/msg00091.html).
>>
>> The second re-enables parallel build. I don't know why it was
>> disabled. Andreas, please comment if you think it should not be
>> re-enabled :)
>
> I can confirm that these two patches work for me. No crashes so far, and
> *much* faster build time. I'd say ship it :)

Pushed!
C
C
Clément Lassieur wrote on 4 Apr 2017 20:24
control message for bug #26361
(address . control@debbugs.gnu.org)
87lgrgc9q6.fsf@lassieur.org
tags 26361 fixed
close 26361
N
Re: bug#26361: Icecat patches
(name . Clément Lassieur)(address . clement@lassieur.org)
20170404214117.zgfcr67sxqicypwd@abyayala
Clément Lassieur transcribed 0.5K bytes:
Toggle quote (19 lines)
> Marius Bakke <mbakke@fastmail.com> writes:
>
> > Clément Lassieur <clement@lassieur.org> writes:
> >
> >> The first patch fixes the crash (see
> >> http://lists.gnu.org/archive/html/guix-devel/2017-04/msg00091.html).
> >>
> >> The second re-enables parallel build. I don't know why it was
> >> disabled. Andreas, please comment if you think it should not be
> >> re-enabled :)
> >
> > I can confirm that these two patches work for me. No crashes so far, and
> > *much* faster build time. I'd say ship it :)
>
> Pushed!
>
>
>

Many thanks!

Also: I think that moved the compile time for icecat from ~3 hours down
to 30 minutes, excluding grafting (other updates are still running).

Excellent :)
?