aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2024-01-05 08:40:40 +0100
committerRicardo Wurmus <rekado@elephly.net>2024-01-05 08:57:53 +0100
commit036d2fc88afb641a5765dd57308a8bd228c7575c (patch)
treeecd8ef80a8c100839fe16011f7998ca4d28d66cb /gnu
parent05fad99a431c6708ec18c7d0db67178bd8d36597 (diff)
downloadguix-036d2fc88afb641a5765dd57308a8bd228c7575c.tar.gz
guix-036d2fc88afb641a5765dd57308a8bd228c7575c.zip
gnu: python-tbb: Fix build.
* gnu/packages/tbb.scm (python-tbb)[arguments]: Call "python setup.py install" with "--root" argument. Change-Id: I290c45f3d64c0bb6ec57a0e406132b4f42808eec
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/tbb.scm46
1 files changed, 24 insertions, 22 deletions
diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index ec630a029f..da3ea74fb6 100644
--- a/gnu/packages/tbb.scm
+++ b/gnu/packages/tbb.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2022 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2022, 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
@@ -51,31 +51,31 @@
`(#:configure-flags
'(,@(if (or (target-riscv64?)
(target-ppc32?))
- '("-DTBB_TEST_LINK_FLAGS=-latomic")
- `())
+ '("-DTBB_TEST_LINK_FLAGS=-latomic")
+ `())
,@(if (or (target-arm32?)
(target-ppc32?))
- '("-DTBB_TEST_COMPILE_FLAGS=-DTBB_TEST_LOW_WORKLOAD")
- `())
- "-DTBB_STRICT=OFF") ;; Don't fail on warnings
+ '("-DTBB_TEST_COMPILE_FLAGS=-DTBB_TEST_LOW_WORKLOAD")
+ `())
+ "-DTBB_STRICT=OFF") ;; Don't fail on warnings
#:phases
(modify-phases %standard-phases
,@(cond
- ((target-arm32?)
- `((add-after 'unpack 'adjust-test-suite
- (lambda _
- (substitute* "test/CMakeLists.txt"
- ;; Bus error, skipped on mips.
- ((".*test_malloc_pools.*") ""))))))
- ((target-ppc32?)
- `((add-after 'unpack 'adjust-test-suite
- (lambda _
- (substitute* "test/CMakeLists.txt"
- ;; These tests hang forever.
- ((".*test_function_node.*") "")
- ((".*test_multifunction_node.*") "")
- ((".*test_async_node.*") ""))))))
- (else '())))))
+ ((target-arm32?)
+ `((add-after 'unpack 'adjust-test-suite
+ (lambda _
+ (substitute* "test/CMakeLists.txt"
+ ;; Bus error, skipped on mips.
+ ((".*test_malloc_pools.*") ""))))))
+ ((target-ppc32?)
+ `((add-after 'unpack 'adjust-test-suite
+ (lambda _
+ (substitute* "test/CMakeLists.txt"
+ ;; These tests hang forever.
+ ((".*test_function_node.*") "")
+ ((".*test_multifunction_node.*") "")
+ ((".*test_async_node.*") ""))))))
+ (else '())))))
(home-page "https://www.threadingbuildingblocks.org")
(synopsis "C++ library for parallel programming")
(description
@@ -101,7 +101,9 @@ tasks, synchronization primitives, atomic operations, and more.")
(lambda _
(substitute* "python/CMakeLists.txt"
(("\\$\\{PYTHON_BUILD_WORK_DIR\\}/build")
- #$output))
+ #$output)
+ (("install --prefix.*-f" m)
+ (string-append m " --root=/")))
(substitute* "python/setup.py"
(("extra_link_args=tbb_flag,")
(string-append "extra_link_args=['-Wl,-rpath="