Merge remote-tracking branch 'origin/master' into core-updates-frozen

This commit is contained in:
Ricardo Wurmus 2021-12-05 19:17:41 +01:00
commit 9bc0f45df5
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
202 changed files with 205024 additions and 194678 deletions

View file

@ -376,11 +376,16 @@ algorithm.")
(assoc-ref %build-inputs "boost")))
#:phases
(modify-phases %standard-phases
(add-before
'configure 'set-CXXFLAGS
(lambda _
(setenv "CXXFLAGS" "-fpermissive ")
#t)))))
(add-after 'unpack 'fix-compatibility-errors
(lambda _
(substitute* "src/library/IAM2WayImportance.h"
(("= std::make_pair.*")
"= std::minmax(varID1, varID2);"))
(substitute* "src/library/DataFrame.h"
(("isFirst\\?.*")
"if (isFirst) { isFirst = false; } else { os << par.delimiter; }\n"))))
(add-before 'configure 'set-CXXFLAGS
(lambda _ (setenv "CXXFLAGS" "-fpermissive "))))))
(inputs
`(("boost" ,boost)
("gsl" ,gsl)