mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 06:46:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: r-rcppparallel: Fix build with gcc-14.

Browse source 
* gnu/packages/cran.scm (r-rcppparallel)[arguments]: Use G-Expressions.  Add
phase "relax-gcc-14-strictness".

Change-Id: I3d6c0d0986405dcc327bddb1eccaf95c298aec1d
This commit is contained in:
Janneke Nieuwenhuizen 2025-01-03 14:39:21 +01:00
parent 50c05b50e8
commit c88bccd001
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/cran.scm
View file

@ -39,6 +39,7 @@
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2024 Marco Baggio <guix@mawumag.com>
;;; Copyright © 2024 Spencer King <spencer.king@geneoscopy.com>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -21664,10 +21665,17 @@ (define-public r-rcppparallel
(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/")