~ruther/guix-local: gnu: tbb: Fix building on armhf-linux.

7e6580670bc615d89d0216ebddfb6ba81feb0238 — Efraim Flashner 2 years ago 8de6ed6

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

patch browse .tar.gz

1 files changed, 13 insertions(+), 1 deletions(-)

M gnu/packages/tbb.scm

M gnu/packages/tbb.scm => gnu/packages/tbb.scm +13 -1

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