| Filename | Latest commit message | Latest commit date |
|---|---|---|
pat-s
e59590e2d6
All checks were successful
ci/crow/cron/process-updates/2 Pipeline was successful
## Summary
Fixes the RcppParallel patch, which was a **no-op** and left the build hanging.
The previous registry entry set `env: { RCPP_PARALLEL_USE_TBB: "0" }`. But `RCPP_PARALLEL_USE_TBB` is a **compile-time `-D` flag** in RcppParallel's Makevars — it is never read from the environment. So the override did nothing: `USE_TBB=Linux` (hardcoded from `uname`) still triggered the **bundled Intel TBB build**, which hangs/fails on musl (Alpine) and newer toolchains (g++ 15 on ubuntu-2604). The `Applying patch …` log only meant the env was set, not that it had any effect.
## Fix
Replace the env entry with a **source patch** (`local/patches/RcppParallel/disable-tbb.patch`) on `src/Makevars.in` that, on Linux:
- leaves `USE_TBB` unset → the whole bundled-TBB build/link path is skipped (no hang), and
- forces `PKG_CXXFLAGS += -DRCPP_PARALLEL_USE_TBB=0` → the sources compile the **TinyThread** backend (needed because `RcppParallel.h` otherwise auto-defaults TBB on for glibc Linux).
## Verification
In a Linux container, applying the patch and running `R CMD INSTALL RcppParallel`:
```
bundled_TBB_build=0 # bundled TBB build never runs
* DONE (RcppParallel) # installs via TinyThread
```
## Note
bincraft's `apply_source_patch` shells out to `patch`. If a build-env image lacks the `patch` tool (common on Alpine), the patch will report "did not apply cleanly" and fall back to an unpatched (hanging) build. If that happens, the follow-up is to switch bincraft's patch application to `git apply` (git is always present) — happy to do that if needed.
Reviewed-on: #106
|
||
| .. | ||
| RcppParallel | ||
| README.md | ||
| registry.json | ||
Patch Registry
This directory contains the curated registry of per-package build-time patches consumed by bincraft's patches argument.
Schema
The registry is defined in registry.json as an array of patch entries. Each entry specifies lightweight build-time overrides (environment variables, configure arguments, Makevars) and optionally a source diff to apply before building.
Field semantics
| Field | Type | Required | Description |
|---|---|---|---|
package |
string | yes | CRAN package name. |
versions |
string | yes | "*" for any, a constraint such as ">=5.1.0", or an exact version "5.1.11-2". Env-tier fixes are typically "*"; source diffs are normally exact or lower-bounded because a diff is pinned to the source it was generated against. |
platforms |
array of strings | yes | Matched against the running build's platform tokens — distro family (alpine, ubuntu, redhat), codename (ubuntu-2604, alpine-324), and arch (amd64, arm64). An entry matches if any listed token matches any build token. ["*"] matches all platforms. |
env |
object | no | Environment variables exported only for this package's isolated build. |
configure_args |
array | no | Arguments passed as --configure-args to the isolated build. |
makevars |
object | no | Key/value pairs written into a package-local Makevars for the isolated build. |
patch |
string or null | no | Path (relative to local/patches/) to a unified diff applied to the unpacked CRAN source before building. |
reason |
string | yes | Human explanation, surfaced in logs and metadata. |
Adding an entry
To add a new patch entry:
-
Add an object to the array in
registry.jsonwith the fields documented above. Start with lightweight overrides (environment variables, configure arguments, Makevars) before resorting to source diffs. -
If a source diff is needed, place it in
local/patches/<package>/<file>.patchand reference its path in thepatchfield. For example, a diff forRcppParallelwould go inlocal/patches/RcppParallel/fix.patchand be referenced as"patch": "RcppParallel/fix.patch". -
The
reasonfield should clearly explain why the patch is needed and what problem it solves.
Validation
The registry is validated and applied by bincraft during the build process. For manual validation, run the validator from the repo root:
Rscript local/validate-patches.R
This validates the schema, referenced patch-file existence, and checks for duplicate entries across platforms and versions.