diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2026-03-09 12:31:27 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2026-04-02 07:37:05 +0200 |
| commit | 09013f9d0eaf7cee7bed317fd8a0645b25e410d4 (patch) | |
| tree | 68dc22e9fa184dd5fcb1ab2828c0a49b707a0f9a | |
| parent | 06475ac99e03faf3ec66c1ef55641d8b71a30ba1 (diff) | |
gnu: r-rcppparallel: Use onetbb library.
* gnu/packages/cran.scm (r-rcppparallel)[arguments]: Remove phases
'relax-gcc-14-strictness and 'gcc-compatibility.
[inputs]: Replace tbb-2020 with onetbb.
Change-Id: Ib49e21a7b44df67a46fdda899d95aa05d8b1ace9
| -rw-r--r-- | gnu/packages/cran.scm | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 362d8f216c2..b933e94f1e8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -32540,28 +32540,8 @@ package provides a minimal R interface by relying on the Rcpp package.") #~(modify-phases %standard-phases (add-after 'unpack 'use-system-tbb (lambda* (#:key inputs #:allow-other-keys) - (setenv "TBB_ROOT" (assoc-ref inputs "tbb")))) - (add-before 'install 'relax-gcc-14-strictness - (lambda _ - ;; XXX FIXME: $HOME/.R/Makevars seems to be the only way to - ;; set custom CFLAGS for R? - (setenv "HOME" (getcwd)) - (mkdir-p ".R") - (with-directory-excursion ".R" - (with-output-to-file "Makevars" - (lambda _ - (display (string-append - "CXXFLAGS=-g -O2" - " -Wno-error=changes-meaning\n"))))))) - ;; This change lets us use GCC 13+. We need to patch things here so - ;; that packages using RcppParallel to generate code can be compiled - ;; without errors. - (add-after 'install 'gcc-compatibility - (lambda _ - (substitute* (string-append #$output "/site-library/RcppParallel/include/tbb/task.h") - (("task\\* next_offloaded") - "tbb::task* next_offloaded"))))))) - (inputs (list tbb-2020)) + (setenv "TBB_ROOT" #$(this-package-input "onetbb"))))))) + (inputs (list onetbb)) (native-inputs (list r-rcpp r-runit)) (home-page "https://rcppcore.github.io/RcppParallel/") (synopsis "Parallel programming tools for Rcpp") |