guix-commits
[Top][All Lists]
Advanced

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

04/04: gnu: tbb: Fix building on armhf-linux.


From: guix-commits
Subject: 04/04: gnu: tbb: Fix building on armhf-linux.
Date: Wed, 15 Nov 2023 10:16:46 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 7e6580670bc615d89d0216ebddfb6ba81feb0238
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Nov 15 16:47:55 2023 +0200

    gnu: tbb: Fix building on armhf-linux.
    
    * gnu/packages/tbb.scm (tbb)[arguments]: Add configure-flag when
    building for armhf-linux to run a lighter test suite.  Add a phase when
    building for armhf-linux to skip a test.
    
    Change-Id: Ic730c82f30357d3a55e92098114a9dc2a6d062e9
---
 gnu/packages/tbb.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index b2d276ac8b..b73ff22e48 100644
--- a/gnu/packages/tbb.scm
+++ b/gnu/packages/tbb.scm
@@ -52,7 +52,19 @@
        '(,@(if (target-riscv64?)
             '("-DTBB_TEST_LINK_FLAGS=-latomic")
             `())
-         "-DTBB_STRICT=OFF"))) ;; Don't fail on warnings
+         ,@(if (target-arm32?)
+             '("-DTBB_TEST_COMPILE_FLAGS=-DTBB_TEST_LOW_WORKLOAD")
+             `())
+         "-DTBB_STRICT=OFF")   ;; Don't fail on warnings
+       #:phases
+       (modify-phases %standard-phases
+         ,@(if (target-arm32?)
+             `((add-after 'unpack 'adjust-test-suite
+                 (lambda _
+                   (substitute* "test/CMakeLists.txt"
+                     ;; Bus error, skipped on mips.
+                     ((".*test_malloc_pools.*") "")))))
+             '()))))
     (home-page "https://www.threadingbuildingblocks.org";)
     (synopsis "C++ library for parallel programming")
     (description



reply via email to

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