me
/
guix
Archived
1
0
Fork 0
Code

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'.
master
Mark H Weaver 2021-11-05 15:31:34 -04:00
parent c55a64cb7e
commit 4fd12fb00d
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/webkit.scm
View File

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