diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2021-11-08 09:06:14 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2021-11-08 09:06:14 +0200 |
commit | 1c94392a13cbdf87e03a644633eb775bf45694a1 (patch) | |
tree | 74f11038dfc5f9d9db06660b1087253b28c5434f /gnu/packages/webkit.scm | |
parent | dd87bbb2b78b279248aaff15c0706fcd6d8cd7bb (diff) | |
parent | 9d25ee30b188f9202cc14f7cd25ba8a1c3ec1a72 (diff) | |
download | guix-patches-1c94392a13cbdf87e03a644633eb775bf45694a1.tar guix-patches-1c94392a13cbdf87e03a644633eb775bf45694a1.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/webkit.scm')
-rw-r--r-- | gnu/packages/webkit.scm | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index e54b680855..688e745d95 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" @@ -295,10 +295,24 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version) (string-append wpebackend-fdo "/lib/" all))) #t))) + ,@(if (string-prefix? "x86_64" (or (%current-target-system) + (%current-system))) + '() + '((add-after 'unpack 'disable-sse2 + (lambda _ + (substitute* "Source/cmake/DetectSSE2.cmake" + (("CHECK_FOR_SSE2\\(\\)") "")))))) (add-before 'configure 'prepare-build-environment (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 (target-x86-32?) + '((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) |