Repository navigation
emscripten: 4.0.11 -> 6.0.3 on llvm-23 (off frozen llvm-21) - #1476
Conversation
6.0.3 is the last emscripten release whose tools/shared.py EXPECTED_LLVM_VERSION is 23 (6.0.4+ expect the unreleased 24), so it moves off llvm-21 onto the prefixed llvm-23, the same shape as before. - build.sh: LLVM_ROOT is /usr/lib/llvm-23/bin; a new guard fails the build when tools/shared.py's EXPECTED_LLVM_VERSION and that clang's major differ (emcc itself only warns). - build.sh: 5.0.2 removed the shell launchers (emcc, em++, ...) from git and the tarball; bootstrap.py creates them. Run only its create-entry-points step (tools/maint/create_entry_points.py) before install.py, not npm ci or submodules, and add a wrapper for the new empath-split entry point. - binaryen stays at 133. 6.0.3 expects 129 (accepts 129/130); the check is a warning, as it was for 4.0.11 (expected 123). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
No actionable comments were generated in the recent review. Walkthrough
Merge Risk:
|
norrietaylor
left a comment
There was a problem hiding this comment.
Scope matches the title. The diff changes only packages/emscripten/build.ncl and packages/emscripten/build.sh. Every hunk traces to the 4.0.11 -> 6.0.3 move, the llvm-21 -> llvm-23 move, or the launchers that 5.0.2 removed from the tarball. Clobber none. HEAD is the PR commit itself, and the diff keeps the existing npm stub, scaffolding cleanup and EM_CACHE wrapper logic unchanged. Correctness packages/llvm-23 exists. It is prefixed at /usr/lib/llvm-23 through llvm/versioned.ncl, and it exports the bins and libs outputs that the subset names. The LLVM guard parses ^clang version N. and llvm/ sets no CLANG_VENDOR, so the parse matches the clang this package gets. One gap: the launcher assertion checks 4 of the 19 launchers that the /usr/bin wrappers exec. Details are in the finding. Stale reference outside the diff: the packages/llvm-21/build.ncl header still lists "emscripten 4.0.11 (EXPECTED_LLVM_VERSION = 21)" as a consumer. The packages/llvm-23/build.ncl header does not list emscripten. Update both in this PR. Not checked: I did not fetch the 6.0.3 tarball. I did not confirm that tools/maint/create_entry_points.py exists at that tag or that it writes empath-split. I did not build the package or run the standalone tests. The pkgmgr-rs series pin follow-up is outside this repo.
packages/emscripten/build.sh:84low · Since 5.0.2 the tarball no longer contains the launchers. All 19/usr/binwrappers below (lines 68-70) now exec a file that onlycreate_entry_points.pycreates. This check covers 4 of them. Assume the script does not createempath-split,emdwp,emscan-deps, or any other name in the wrapper list. The build still passes, and the package then ships a/usr/bin/<tool>that fails withexec: /usr/share/emscripten/<tool>: not found.empath-splitis new in this PR, so it is the most likely gap. No standalone test calls any wrapper other thanemccandemar. Assert the full wrapper list here, or test after install.py that each$EM_ROOT/$tin the wrapper loop is executable. This instance is local: no other package uses this pattern.
Moves emscripten off the frozen
llvm-21(pkgs#1339) onto LLVM 23.Version choice
EXPECTED_LLVM_VERSIONintools/shared.py, per tag: 4.0.11 = 21, 4.0.12–4.0.23 = 22, 5.0.0–6.0.3 = 23, 6.0.4–7.0.0 = 24 (LLVM 24 is not released). So 6.0.3 is the newest release that runs on LLVM 23. 6.0.4+ comes with LLVM 24.Changes
build.ncl: 4.0.11 → 6.0.3.llvm-21→llvm-23(prefixed, same["bins", "libs"]subset), so a later default-llvmmajor can't change the compiler underneath it.build.sh:LLVM_ROOT = /usr/lib/llvm-23/bin. New guard: the build fails whentools/shared.py'sEXPECTED_LLVM_VERSIONdiffers from that clang's major (emcc itself only warns).build.sh: 5.0.2 removed theemcc/em++/... shell launchers from git and the tarball (Remove remaining launcher files from git. NFC emscripten-core/emscripten#26247).bootstrap.pycreates them, along withnpm ciand submodules. We run only its launcher step (tools/maint/create_entry_points.py) beforeinstall.pyand assert the launchers exist. Also added a wrapper for the newempath-splitentry point.Source sha256
033241f96a5c50993b43d8383c3356d2804932f5b3548e94c9839c4f68e8b5bd(codeloadrefs/tags/6.0.3, the bytes behind the recipe'sarchive/refs/tagsURL). The upstream URL is unchanged, so there's nothing to mirror.Not verified
Nothing was built locally. The standalone tests (
compile_archive,link_run,fetches_nothing,no_build_scaffolding) cover the risky parts: the generated launchers, the sysroot cache under binaryen 133, and the extra launcher filesinstall.pynow copies.Follow-up
pkgmgr-rs
data/series_pins.toml[emscripten] series = "4.0.11"has to move to6.0.3in step with this change, or the updater will hold it back.Rebuilds: emscripten plus raylib, raygui, odin and ols (transitive importers).
🤖 Generated with Claude Code
Summary by CodeRabbit