guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: gnu: qtwebkit: Remove workaround for binutils bug.


From: guix-commits
Subject: 03/04: gnu: qtwebkit: Remove workaround for binutils bug.
Date: Wed, 8 Sep 2021 08:39:36 -0400 (EDT)

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

commit 3ed18c05e930ae0d4c3a72b588b3e24f805c7aef
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Wed Sep 8 09:25:50 2021 +0200

    gnu: qtwebkit: Remove workaround for binutils bug.
    
    This is a follow-up to de8e2a699c0219f5ea86f6bbfff4d5ee35104738.
    
    * gnu/packages/qt.scm (qtwebkit)[arguments]: Remove custom 'build' phase.
---
 gnu/packages/qt.scm | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ff9a99c..05037b0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2733,19 +2733,7 @@ different kinds of sliders, and much more.")
                                ;; libraries and test executables in a
                                ;; reasonable amount of memory.
                                
"-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-keep-memory"
-                               "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-keep-memory")
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'build
-           ;; This is a workaround for the build failing with the error:
-           ;;   ld: error adding symbols: Malformed archive
-           ;; Increasing the maximum number of open file descriptors
-           ;; makes the build succeed.
-           (lambda* (#:key make-flags #:allow-other-keys)
-             (let ((cmd (format #f
-                                "ulimit -n 4096; make ~{~a~^ ~}"
-                                make-flags)))
-               (invoke "sh" "-c" cmd)))))))
+                               
"-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-keep-memory")))
     (home-page "https://www.webkit.org";)
     (synopsis "Web browser engine and classes to render and interact with web
 content")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]