janneke pushed a commit to branch core-packages-team
in repository guix.

commit 9a99e47c176413b9363d5814b207c6a440c903e8
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Fri Jan 3 14:39:21 2025 +0100

    gnu: r-rcppparallel: Fix build with gcc-14.
    
    * gnu/packages/cran.scm (r-rcppparallel)[arguments]: Use G-Expressions.  Add
    phase "relax-gcc-14-strictness".
    
    Change-Id: I3d6c0d0986405dcc327bddb1eccaf95c298aec1d
---
 gnu/packages/cran.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index a3898e54ef..d5a665805f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2024 Marco Baggio <g...@mawumag.com>
 ;;; Copyright © 2024 Spencer King <spencer.k...@geneoscopy.com>
 ;;; Copyright © 2024 Tor-björn Claesson <tclaes...@gmail.com>
+;;; Copyright © 2025 Janneke Nieuwenhuizen <jann...@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21980,10 +21981,22 @@ package provides a minimal R interface by relying on 
the Rcpp package.")
     (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")))))))
+      #~(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"))))))))))
     (inputs (list tbb-2020))
     (native-inputs (list r-rcpp r-runit))
     (home-page "https://rcppcore.github.io/RcppParallel/";)

Reply via email to