fix(patches): support RcppParallel 6.2.1
All checks were successful
ci/crow/cron/process-updates/9 Pipeline was successful
ci/crow/cron/process-updates/13 Pipeline was successful
ci/crow/cron/process-updates/8 Pipeline was successful
ci/crow/cron/process-updates/10 Pipeline was successful
ci/crow/cron/process-updates/14 Pipeline was successful
ci/crow/cron/process-updates/4 Pipeline was successful
ci/crow/cron/process-updates/15 Pipeline was successful
ci/crow/cron/process-updates/3 Pipeline was successful
ci/crow/cron/process-updates/16 Pipeline was successful
ci/crow/cron/process-updates/18 Pipeline was successful
ci/crow/cron/process-updates/11 Pipeline was successful
ci/crow/cron/process-updates/12 Pipeline was successful
ci/crow/cron/process-updates/17 Pipeline was successful
ci/crow/cron/process-updates/6 Pipeline was successful
ci/crow/cron/process-updates/5 Pipeline was successful
ci/crow/cron/process-updates/1 Pipeline was successful
All checks were successful
ci/crow/cron/process-updates/9 Pipeline was successful
ci/crow/cron/process-updates/13 Pipeline was successful
ci/crow/cron/process-updates/8 Pipeline was successful
ci/crow/cron/process-updates/10 Pipeline was successful
ci/crow/cron/process-updates/14 Pipeline was successful
ci/crow/cron/process-updates/4 Pipeline was successful
ci/crow/cron/process-updates/15 Pipeline was successful
ci/crow/cron/process-updates/3 Pipeline was successful
ci/crow/cron/process-updates/16 Pipeline was successful
ci/crow/cron/process-updates/18 Pipeline was successful
ci/crow/cron/process-updates/11 Pipeline was successful
ci/crow/cron/process-updates/12 Pipeline was successful
ci/crow/cron/process-updates/17 Pipeline was successful
ci/crow/cron/process-updates/6 Pipeline was successful
ci/crow/cron/process-updates/5 Pipeline was successful
ci/crow/cron/process-updates/1 Pipeline was successful
This change will:\n\n- Relax the TBB include hunk context to tolerate the upstream TBB_CXXFLAGS block.\n- Pin the source patch to the verified RcppParallel version.
This commit is contained in:
parent
b0d58f3f7c
commit
eeebef8edb
2 changed files with 2 additions and 6 deletions
|
|
@ -40,15 +40,11 @@ index 6f6a745..e407986 100644
|
||||||
if (is.null(name))
|
if (is.null(name))
|
||||||
return(tbbRoot)
|
return(tbbRoot)
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ tbbCxxFlags <- function() {
|
@@ -58,3 +58,3 @@ tbbCxxFlags <- function() {
|
||||||
flags <- c("-DRCPP_PARALLEL_USE_TBB=1")
|
|
||||||
|
|
||||||
# if TBB_INC is set, apply those library paths
|
# if TBB_INC is set, apply those library paths
|
||||||
- tbbInc <- Sys.getenv("TBB_INC", unset = TBB_INC)
|
- tbbInc <- Sys.getenv("TBB_INC", unset = TBB_INC)
|
||||||
+ tbbInc <- bincraftGetenv("TBB_INC", unset = TBB_INC)
|
+ tbbInc <- bincraftGetenv("TBB_INC", unset = TBB_INC)
|
||||||
if (!file.exists(tbbInc)) {
|
if (!file.exists(tbbInc)) {
|
||||||
tbbInc <- system.file("include", package = "RcppParallel")
|
|
||||||
}
|
|
||||||
@@ -117,7 +117,7 @@ tbbLdFlags <- function() {
|
@@ -117,7 +117,7 @@ tbbLdFlags <- function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"package": "RcppParallel",
|
"package": "RcppParallel",
|
||||||
"versions": ">=6.0.0",
|
"versions": "6.2.1",
|
||||||
"platforms": ["*"],
|
"platforms": ["*"],
|
||||||
"env": {},
|
"env": {},
|
||||||
"configure_args": [],
|
"configure_args": [],
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue