janneke pushed a commit to branch core-packages-team
in repository guix.
commit 0bce2bc759af96f7bb4e1653fb8ce9a29e6f46fc
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Sat Jan 4 11:34:17 2025 +0100
Revert "gnu: r-rcppparallel: Fix build with gcc-14."
This _still_ doesn't use -Wno-error=changes-meaning with some compilations.
This reverts commit 3ba60915216e836726d02885d3992a7ba5d403cc.
Change-Id: I4f892c06766c0dd47d0a01d03caddf031d29497a
---
gnu/packages/cran.scm | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 66bef1a646..a3898e54ef 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -40,7 +40,6 @@
;;; 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.
;;;
@@ -21981,17 +21980,10 @@ 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"))))
- (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 "))))))))
+ '(modify-phases %standard-phases
+ (add-after 'unpack 'use-system-tbb
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "TBB_ROOT" (assoc-ref inputs "tbb")))))))
(inputs (list tbb-2020))
(native-inputs (list r-rcpp r-runit))
(home-page "https://rcppcore.github.io/RcppParallel/";)
