ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python-tbb: Fix build.

Browse source 
* gnu/packages/tbb.scm (python-tbb)[arguments]: Call "python setup.py install"
with "--root" argument.

Change-Id: I290c45f3d64c0bb6ec57a0e406132b4f42808eec
This commit is contained in:
Ricardo Wurmus 2024-01-05 08:40:40 +01:00
parent 05fad99a43
commit 036d2fc88a
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gnu/packages/tbb.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
@ -51,31 +51,31 @@ (define-public tbb
`(#:configure-flags `(#:configure-flags
'(,@(if (or (target-riscv64?) '(,@(if (or (target-riscv64?)
(target-ppc32?)) (target-ppc32?))
'("-DTBB_TEST_LINK_FLAGS=-latomic") '("-DTBB_TEST_LINK_FLAGS=-latomic")
`()) `())
,@(if (or (target-arm32?) ,@(if (or (target-arm32?)
(target-ppc32?)) (target-ppc32?))
'("-DTBB_TEST_COMPILE_FLAGS=-DTBB_TEST_LOW_WORKLOAD") '("-DTBB_TEST_COMPILE_FLAGS=-DTBB_TEST_LOW_WORKLOAD")
`()) `())
"-DTBB_STRICT=OFF") ;; Don't fail on warnings "-DTBB_STRICT=OFF") ;; Don't fail on warnings
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@(cond ,@(cond
((target-arm32?) ((target-arm32?)
`((add-after 'unpack 'adjust-test-suite `((add-after 'unpack 'adjust-test-suite
(lambda _ (lambda _
(substitute* "test/CMakeLists.txt" (substitute* "test/CMakeLists.txt"
;; Bus error, skipped on mips. ;; Bus error, skipped on mips.
((".*test_malloc_pools.*") "")))))) ((".*test_malloc_pools.*") ""))))))
((target-ppc32?) ((target-ppc32?)
`((add-after 'unpack 'adjust-test-suite `((add-after 'unpack 'adjust-test-suite
(lambda _ (lambda _
(substitute* "test/CMakeLists.txt" (substitute* "test/CMakeLists.txt"
;; These tests hang forever. ;; These tests hang forever.
((".*test_function_node.*") "") ((".*test_function_node.*") "")
((".*test_multifunction_node.*") "") ((".*test_multifunction_node.*") "")
((".*test_async_node.*") "")))))) ((".*test_async_node.*") ""))))))
(else '()))))) (else '())))))
(home-page "https://www.threadingbuildingblocks.org") (home-page "https://www.threadingbuildingblocks.org")
(synopsis "C++ library for parallel programming") (synopsis "C++ library for parallel programming")
(description (description
@ -101,7 +101,9 @@ (define-public python-tbb
(lambda _ (lambda _
(substitute* "python/CMakeLists.txt" (substitute* "python/CMakeLists.txt"
(("\\$\\{PYTHON_BUILD_WORK_DIR\\}/build") (("\\$\\{PYTHON_BUILD_WORK_DIR\\}/build")
#$output)) #$output)
(("install --prefix.*-f" m)
(string-append m " --root=/")))
(substitute* "python/setup.py" (substitute* "python/setup.py"
(("extra_link_args=tbb_flag,") (("extra_link_args=tbb_flag,")
(string-append "extra_link_args=['-Wl,-rpath=" (string-append "extra_link_args=['-Wl,-rpath="