branch master updated: gnu: webkitgtk: Fix build on i686-linux.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mhw pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 4fd12fb  gnu: webkitgtk: Fix build on i686-linux.
4fd12fb is described below

commit 4fd12fb00d595b6f6a5d5cc734863f4c4bc5f46c
Author: Mark H Weaver <mhw@netris.org>
AuthorDate: Fri Nov 5 15:31:34 2021 -0400

    gnu: webkitgtk: Fix build on i686-linux.
    
    Fixes <https://bugs.gnu.org/51591>.
    
    * gnu/packages/webkit.scm (webkitgtk)[arguments]: Use quasiquote for the
    argument list.  When building on i686-linux, insert a 'substitute*' form in
    the 'prepare-build-environment' phase that disables the use of
    '__builtin_mul_overflow'.
---
 gnu/packages/webkit.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index e54b680..a184cc9 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -241,7 +241,7 @@ acceleration in mind, leveraging common 3D graphics APIs 
for best performance.")
     (build-system cmake-build-system)
     (outputs '("out" "doc"))
     (arguments
-     '(#:tests? #f ; no tests
+     `(#:tests? #f ; no tests
        #:build-type "Release" ; turn off debugging symbols to save space
        #:configure-flags (list
                           "-DPORT=GTK"
@@ -299,6 +299,13 @@ acceleration in mind, leveraging common 3D graphics APIs 
for best performance.")
            (lambda* (#:key inputs #:allow-other-keys)
              (setenv "CC" "clang")
              (setenv "CXX" "clang++")
+             ;; XXX Until we switch back to using GCC,
+             ;; work around <https://bugs.gnu.org/51591>.
+             ,@(if (string=? "i686-linux" (%current-system))
+                   '((substitute* "Source/WTF/wtf/CheckedArithmetic.h"
+                       (("#define USE_MUL_OVERFLOW 1")
+                        "#define USE_MUL_OVERFLOW 0")))
+                   '())
              #t))
          (add-after 'install 'move-doc-files
            (lambda* (#:key outputs #:allow-other-keys)