fix: RcppParallel disable-TBB source patch (env var was a no-op) #106
2 changed files with 19 additions and 3 deletions
16
local/patches/RcppParallel/disable-tbb.patch
Normal file
16
local/patches/RcppParallel/disable-tbb.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
diff --git a/src/Makevars.in b/src/Makevars.in
|
||||||
|
index be8445f..faee771 100644
|
||||||
|
--- a/src/Makevars.in
|
||||||
|
+++ b/src/Makevars.in
|
||||||
|
@@ -60,7 +60,10 @@ else
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(UNAME), Linux)
|
||||||
|
- USE_TBB=Linux
|
||||||
|
+ # bincraft patch: the bundled Intel TBB build hangs/fails on musl (Alpine)
|
||||||
|
+ # and newer toolchains (g++ 15). Skip it (leave USE_TBB unset) and force the
|
||||||
|
+ # TinyThread backend so RcppParallel still builds.
|
||||||
|
+ PKG_CXXFLAGS += -DRCPP_PARALLEL_USE_TBB=0
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(UNAME), SunOS)
|
||||||
|
|
@ -3,10 +3,10 @@
|
||||||
"package": "RcppParallel",
|
"package": "RcppParallel",
|
||||||
"versions": "*",
|
"versions": "*",
|
||||||
"platforms": ["alpine", "ubuntu-2604"],
|
"platforms": ["alpine", "ubuntu-2604"],
|
||||||
"env": { "RCPP_PARALLEL_USE_TBB": "0" },
|
"env": {},
|
||||||
"configure_args": [],
|
"configure_args": [],
|
||||||
"makevars": {},
|
"makevars": {},
|
||||||
"patch": null,
|
"patch": "RcppParallel/disable-tbb.patch",
|
||||||
"reason": "bundled Intel TBB fails to build on musl and on newer toolchains (e.g. g++ 15 on ubuntu-2604); disabling TBB falls back to TinyThread"
|
"reason": "bundled Intel TBB build hangs/fails on musl (Alpine) and newer toolchains (g++ 15 on ubuntu-2604); patch unsets USE_TBB and forces -DRCPP_PARALLEL_USE_TBB=0 so RcppParallel skips the bundled build and uses the TinyThread backend"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue