bug#26361: Icecat patches

bug#26361: Icecat patches

[Clément Lassieur]

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 :)

Clément

bug#26361: [PATCH 1/2] gnu: icecat: Use bundled ICU to avoid crashes.

[Clément Lassieur]

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(-)

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

bug#26361: [PATCH 2/2] gnu: icecat: Re-enable parallel build.

[Clément Lassieur]

gnu/packages/gnuzilla.scm (icecat)[arguments]: Re-enable parallel build.
---
 gnu/packages/gnuzilla.scm | 1 -
 1 file changed, 1 deletion(-)

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

bug#26361: [PATCH 1/2] gnu: icecat: Use bundled ICU to avoid crashes.

[Clément Lassieur]

> gnu/packages/gnuzilla.scm (icecat)[arguments] <#:configure-flags>:
^
I forgot the * here.  I'll add it when I push.  Same with the other
patch.

> 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"

bug#26361: Icecat patches

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

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 :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26361: Icecat patches

[Clément Lassieur]

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!

bug#26361: Icecat patches

[ng0]

Clément Lassieur transcribed 0.5K bytes:
> 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 :)