From 3945e556c73f1883f73bd476aa0e59d15869cb1d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Nov 2025 13:18:16 +0100 Subject: [PATCH] gnu: r-rcppparallel: Patch TBB task.h. Patching this file lets us compile downstream packages without errors. * gnu/packages/cran.scm (r-rcppparallel)[arguments]: Add phase 'gcc-compatibility. Change-Id: I966c09887f1536dcc623d322f6b141fad069e3dd Signed-off-by: Simon Tournier --- gnu/packages/cran.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 43d64f1242e7b03d71d07370470b58526e7a9169..768182d0bab4175681efcc5147c25ab07810a3a0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29737,7 +29737,15 @@ package provides a minimal R interface by relying on the Rcpp package.") (lambda _ (display (string-append "CXXFLAGS=-g -O2" - " -Wno-error=changes-meaning\n")))))))))) + " -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)) (native-inputs (list r-rcpp r-runit)) (home-page "https://rcppcore.github.io/RcppParallel/")