guix-commits
[Top][All Lists]
Advanced

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

76/77: gnu: qtbase: Fix building on i686-linux.


From: guix-commits
Subject: 76/77: gnu: qtbase: Fix building on i686-linux.
Date: Thu, 21 Nov 2024 10:36:05 -0500 (EST)

z572 pushed a commit to branch master
in repository guix.

commit 09cfda01455c6e148a014c18f22103fc245adb36
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Nov 20 12:57:17 2024 +0200

    gnu: qtbase: Fix building on i686-linux.
    
    * gnu/packages/qt.scm (qtbase)[arguments]: When building for i686-linux
    add a phase to skip building one of the tests.
    
    Change-Id: Ia594e851864d967bfb3716c3e89ba4947206bb4a
---
 gnu/packages/qt.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3cdd7c7b3e..a6a431b8e0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -799,6 +799,14 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
                    (string-append head "\"$ENV{CMAKE_PREFIX_PATH}\"")))))
             (delete 'patch-bin-sh)
             (delete 'patch-xdg-open)
+            ;; Some tests fail to build on i686-linux
+            #$@(if (target-x86-32?)
+                   #~((add-after 'unpack 'skip-some-tests
+                        ;; This might be a FLOAT16 problem.
+                        (lambda _
+                          (substitute* 
"tests/auto/corelib/global/CMakeLists.txt"
+                            ((".*qcomparehelpers.*") "")))))
+                   #~())
             (add-after 'patch-paths 'patch-more-paths
               (lambda* (#:key inputs #:allow-other-keys)
                 (substitute* (find-files "bin" "\\.in$")



reply via email to

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