01/01: gnu: webkitgtk-2.4, webkitgtk/gtk+-2, qt: Disable parallel builds.

[Andreas Enge]

andreas pushed a commit to branch core-updates
in repository guix.

commit 46854e99caadcaaa282be1093e3ea6454667cac3
Author: Andreas Enge <address@hidden>
Date:   Mon Jan 25 23:33:54 2016 +0100

    gnu: webkitgtk-2.4, webkitgtk/gtk+-2, qt: Disable parallel builds.
    
    * gnu/packages/webkit.scm (webkitgtk-2.4, webkitgtk/gtk+-2):
      Disable parallel builds as suggested in
      https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html .
    * gnu/packages/qt.scm (qt): Likewise.
---
 gnu/packages/qt.scm     |    7 ++++++-
 gnu/packages/webkit.scm |   12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8f148c9..dccc9a2 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -182,7 +182,12 @@ X11 (yet).")
        ("ruby" ,ruby)
        ("which" ,(@ (gnu packages base) which))))
     (arguments
-     `(#:phases
+     `(;; FIXME: Disabling parallel building is a quick hack to avoid the
+       ;; failure described in
+       ;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html
+       ;; A more structural fix is needed.
+       #:parallel-build? #f
+       #:phases
          (alist-replace
           'configure
           (lambda* (#:key outputs #:allow-other-keys)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index dd05446..f902433 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -149,6 +149,11 @@ HTML/CSS applications to full-fledged web browsers.")
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f ; no tests
+       ;; FIXME: Disabling parallel building is a quick hack to avoid the
+       ;; failure described in
+       ;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html
+       ;; A more structural fix is needed.
+       #:parallel-build? #f
        #:phases (modify-phases %standard-phases
                   (add-after
                    'unpack 'set-gcc
@@ -163,7 +168,12 @@ HTML/CSS applications to full-fledged web browsers.")
   (package (inherit webkitgtk-2.4)
     (name "webkitgtk-gtk2")
     (arguments
-     `(#:configure-flags
+     `(;; FIXME: Disabling parallel building is a quick hack to avoid the
+       ;; failure described in
+       ;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html
+       ;; A more structural fix is needed.
+       #:parallel-build? #f
+       #:configure-flags
        '("--enable-webkit2=no"
          "--with-gtk=2.0")
        ,@(package-arguments webkitgtk-2.4)))