janneke pushed a commit to branch core-packages-team
in repository guix.
commit 1cafd28c146b8a5233e12a26079a880d3d800c97
Author: Janneke Nieuwenhuizen <[email protected]>
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 | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 8522eb07a5..de686d1af4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -40,6 +40,7 @@
;;; Copyright © 2024 Marco Baggio <[email protected]>
;;; Copyright © 2024, 2025 Spencer King <[email protected]>
;;; Copyright © 2024 Tor-björn Claesson <[email protected]>
+;;; Copyright © 2025 Janneke Nieuwenhuizen <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -22042,10 +22043,17 @@ 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 _
+ (substitute* "src/Makevars.in"
+ (("(PKG|TBB)_CXXFLAGS =" all)
+ (string-append all " -Wno-error=changes-meaning"))
+ (("CXXFLAGS=\"" all)
+ (string-append all "-Wno-error=changes-meaning "))))))))
(inputs (list tbb-2020))
(native-inputs (list r-rcpp r-runit))
(home-page "https://rcppcore.github.io/RcppParallel/";)
