From 63f78f6a6ea0d33f3b1fa68c7285cfb865677211 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 4 Nov 2021 06:08:19 +0100 Subject: gnu: webkitgtk: Use GCC 11 instead of Clang. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WebkitGTK still compiles fine on x86_64 using GCC 11. This is the only architecture known to compile currently, as i686 fails with Clang and others fail due to unsatisfied dependencies. * gnu/packages/webkit.scm (webkitgtk)[#:phases]: Drop ‘prepare-build-environment’. [native-inputs]: Drop clang, add gcc. --- gnu/packages/webkit.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu/packages/webkit.scm') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index e54b680855..7384ead14b 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -295,11 +295,6 @@ 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))) - (add-before 'configure 'prepare-build-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CC" "clang") - (setenv "CXX" "clang++") - #t)) (add-after 'install 'move-doc-files (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -309,8 +304,8 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (string-append doc "/share/gtk-doc")) #t)))))) (native-inputs - `(("clang" ,clang-11) - ("bison" ,bison) + `(("bison" ,bison) + ("gcc" ,gcc-11) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 1007eb4874b7d3d2e0ecda07157f5794a0591ea2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 4 Nov 2021 08:27:15 -0400 Subject: Revert "gnu: webkitgtk: Use GCC 11 instead of Clang." This reverts commit 63f78f6a6ea0d33f3b1fa68c7285cfb865677211. It led to broken builds of epiphany, gnome-online-accounts, yelp, zenity, surf, and possibly others. --- gnu/packages/webkit.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages/webkit.scm') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 7384ead14b..e54b680855 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -295,6 +295,11 @@ 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))) + (add-before 'configure 'prepare-build-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CC" "clang") + (setenv "CXX" "clang++") + #t)) (add-after 'install 'move-doc-files (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -304,8 +309,8 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (string-append doc "/share/gtk-doc")) #t)))))) (native-inputs - `(("bison" ,bison) - ("gcc" ,gcc-11) + `(("clang" ,clang-11) + ("bison" ,bison) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 4fd12fb00d595b6f6a5d5cc734863f4c4bc5f46c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 5 Nov 2021 15:31:34 -0400 Subject: gnu: webkitgtk: Fix build on i686-linux. Fixes . * 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(-) (limited to 'gnu/packages/webkit.scm') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index e54b680855..a184cc9b32 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 . + ,@(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) -- cgit v1.2.3 From d82fd7c2dd542693988f61fb15c020e3209ac7ec Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 6 Nov 2021 09:21:02 +0100 Subject: gnu: webkitgtk: Disable SSE2 when not on x86_64. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/webkit.scm (webkitgtk)[#:phases]: Add ‘disable-sse2’ if the current (target) system is not an x86_64 one. --- gnu/packages/webkit.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/webkit.scm') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index a184cc9b32..5931402b98 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -295,6 +295,13 @@ 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") -- cgit v1.2.3 From b11badfb4cd8124f2f467697cf2a4d15e7f20b19 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 6 Nov 2021 05:31:04 -0400 Subject: gnu: webkitgtk: Improve the 32-bit x86 target check. * gnu/packages/webkit.scm (webkitgtk)[arguments]: In the 'prepare-build-environment' phase, use 'target-x86-32?'. --- gnu/packages/webkit.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/webkit.scm') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 5931402b98..688e745d95 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -308,7 +308,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (setenv "CXX" "clang++") ;; XXX Until we switch back to using GCC, ;; work around . - ,@(if (string=? "i686-linux" (%current-system)) + ,@(if (target-x86-32?) '((substitute* "Source/WTF/wtf/CheckedArithmetic.h" (("#define USE_MUL_OVERFLOW 1") "#define USE_MUL_OVERFLOW 0"))) -- cgit v1.2.3