summaryrefslogtreecommitdiff
path: root/gnu/packages/cran.scm
diff options
context:
space:
mode:
authorSharlatan Hellseher <sharlatanus@gmail.com>2025-08-06 22:01:59 +0100
committerSharlatan Hellseher <sharlatanus@gmail.com>2025-08-07 18:33:37 +0100
commit4dbe55197131fcc3417288d71aadaa8563b50cc8 (patch)
tree193ba0c7f01a13277ec15c8a5acf54ae1406a5df /gnu/packages/cran.scm
parent41df2ab16d19bed223cb5d04f7ddee70db41d9a5 (diff)
gnu: r-stringfish: Update to 0.17.0, fix build with gcc@14.
* gnu/packages/cran.scm (r-stringfish): Update to 0.17.0. [arguments] <phases>: Add 'use-system-tbb, and 'relax-gcc-14-strictness. [inputs]: Add tbb-2020. Change-Id: Ibb7b7fface988727b185763b47cf7074119088f0
Diffstat (limited to 'gnu/packages/cran.scm')
-rw-r--r--gnu/packages/cran.scm29
1 files changed, 24 insertions, 5 deletions
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 64b7d820b40..1d1c395d8db 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -53413,21 +53413,40 @@ the @code{raster} package that is suitable for extracting raster values using
(define-public r-stringfish
(package
(name "r-stringfish")
- (version "0.16.0")
+ (version "0.17.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "stringfish" version))
(sha256
(base32
- "14vrg6mkwwgw1klgpvjn7936yfxav55rainz71xjjih2j21vq21n"))))
+ "0x6nad21q7shsl7wjzldb6si7j09dyxksrpq29cxphh79d0ga2ly"))))
(properties
'((upstream-name . "stringfish")
(updater-extra-inputs . ("pcre2"))))
(build-system r-build-system)
- ;; Tests require r-qs, which depends on this package.
- (arguments (list #:tests? #false))
- (inputs (list pcre2))
+ (arguments
+ (list
+ ;; Tests require r-qs, which depends on this package.
+ #:tests? #false
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'use-system-tbb
+ (lambda _
+ (setenv "TBB_ROOT" #$(this-package-input "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 pcre2 tbb-2020))
(propagated-inputs
(list r-rcpp r-rcppparallel))
(native-inputs