branch master updated: gnu: r-rcppparallel: Do not use bundled tbb.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 51f978f4ad gnu: r-rcppparallel: Do not use bundled tbb.
51f978f4ad is described below

commit 51f978f4ad796e8e44a0a19ee5ab468b4b8a3958
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sun Aug 14 21:07:10 2022 +0200

    gnu: r-rcppparallel: Do not use bundled tbb.
    
    * gnu/packages/cran.scm (r-rcppparallel)[inputs]: Add tbb-2020.
    [arguments]: Add build phase 'use-system-tbb to set TBB_ROOT.
    [source]: Add snippet to remove bundled tbb.
---
 gnu/packages/cran.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index f76f50b68d..eb772ce5ae 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -104,6 +104,7 @@
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages statistics)
+  #:use-module (gnu packages tbb)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages textutils)
@@ -13665,9 +13666,20 @@ package provides a minimal R interface by relying on 
the Rcpp package.")
        (uri (cran-uri "RcppParallel" version))
        (sha256
         (base32
-         "1sn211ajlb1p12sglxqns175rg078yvww268m8cp0vvd7cmk55k3"))))
+         "1sn211ajlb1p12sglxqns175rg078yvww268m8cp0vvd7cmk55k3"))
+       (modules '((guix build utils)))
+       (snippet
+        '(delete-file-recursively "src/tbb/"))))
     (properties `((upstream-name . "RcppParallel")))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'use-system-tbb
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "TBB_ROOT" (assoc-ref inputs "tbb")))))))
+    (inputs (list tbb-2020))
     (home-page "https://rcppcore.github.io/RcppParallel/";)
     (synopsis "Parallel programming tools for Rcpp")
     (description