From d374dc2bc0d066858adf9350155e4d0d3edb46a4 Mon Sep 17 00:00:00 2001 From: pat-s Date: Mon, 20 Jul 2026 17:37:42 +0000 Subject: [PATCH] fix(patches): widen RcppParallel system-tbb scope to all oneTBB-2021 platforms #135 scoped the system-tbb patch to alpine + ubuntu-2604. An audit of every build-env image showed RcppParallel's bundled Intel TBB build fails on all platforms with a modern toolchain, and the system oneTBB is usable wherever the image ships oneTBB 2021+. Widen the scope to alpine, all ubuntu (jammy/noble/resolute -- the family token now covers 2204/2404/2604), and redhat-10. el8 (TBB 2018) and el9 (TBB 2020.3) ship pre-oneTBB TBB and keep the bundled build, so they stay out of scope. Requires the matching build-env-images env (TBB_INC/TBB_LIB), extended to all ubuntu and el10 there. Verified in the build-env images: RcppParallel + rstan build and link on alpine, redhat-10, ubuntu noble and ubuntu resolute; RcppParallel builds on ubuntu jammy. --- local/patches/registry.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/local/patches/registry.json b/local/patches/registry.json index c446fda..b444986 100644 --- a/local/patches/registry.json +++ b/local/patches/registry.json @@ -4,13 +4,14 @@ "versions": "*", "platforms": [ "alpine", - "ubuntu-2604" + "ubuntu", + "redhat-10" ], "env": {}, "configure_args": [], "makevars": {}, "patch": "RcppParallel/system-tbb.patch", - "reason": "bundled Intel TBB build hangs/fails on musl (Alpine) and newer toolchains (g++ 15 on ubuntu-2604); link the system oneTBB (now in the build-env images) instead, keeping the TBB backend so dependents (rstan, ...) link TBB" + "reason": "RcppParallel bundles an old Intel TBB whose build fails on musl and modern toolchains (g++ 14/15); link the system oneTBB (2021+) shipped in the build-env images instead, keeping the TBB backend so dependents (rstan, ...) link TBB. Scoped to platforms with oneTBB 2021+ (alpine, all ubuntu, el10); el8/el9 ship pre-oneTBB TBB and are left on the bundled build." }, { "package": "fs", -- 2.54.0