Switched LuaJIT to WohlSoft fork#279
Merged
Causeless merged 1 commit intoMay 28, 2026
Merged
Conversation
…6-04-25) Re-adopts the WohlSoft fork after the Feb 2023 swap to upstream sources (485d7f2), pinning to current tip @ dfcb8651 (2026-04-25). WohlSoft tracks upstream LuaJIT/LuaJIT v2.1 closely (7 commits behind as of today), so this also catches ~3-4 years of upstream LuaJIT fixes since the 2022 baseline, notably the recent JIT/interpreter consistency work. WohlSoft's UTF-8 path patch ships in this drop via lj_fopen.c / lj_fopen.h but stays dormant: CCCP's build doesn't define LUAJIT_FORCE_UTF8_FOPEN, so _lua_fopen / _lua_freopen macro to plain fopen / freopen, identical to upstream LuaJIT's Windows behavior. Available as a future toggle if we want UTF-8 Windows paths. Added lj_fopen.c to src/meson.build + libluajit.vcxproj. Preserves CCCP build glue (meson.build, meson_options.txt, libluajit.vcxproj, msvc-prebuild.bat, msvc-postbuild.bat). src/luajit.h regenerated from the new luajit_rolling.h template (rolling version 1777102609 matching dfcb8651). Rebuilds _Bin/*.lib from the new source so Windows still links; follow-up PR drops the prebuilts entirely and wires libluajit.vcxproj into RTEA.sln. Verified clean on Windows MSBuild (Final / Debug Full / Debug Minimal / Debug Release, x64) + Linux Meson via WSL2. macOS-arm64 deferred to CI. WohlSoft v2.1 is 7 commits behind upstream LuaJIT/LuaJIT v2.1 as of 2026-05-26 (recent sanitizer fixes); can sync in a follow-up if WohlSoft hasn't picked them up by then.
Causeless
approved these changes
May 28, 2026
Merged
via the queue into
cortex-command-community:development
with commit May 28, 2026
15a66e9
4 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Switches
external/sources/LuaJIT-2.1/from the 2022-era upstream LuaJIT/LuaJIT snapshot back to the WohlSoft fork at current tip (dfcb8651, 2026-04-25). WohlSoft was vendored here originally, then swapped to upstream sources in485d7f280(Feb 2023). It tracks upstream LuaJIT/LuaJIT v2.1 closely (7 commits behind as of today), so this picks up ~3-4 years of upstream LuaJIT fixes since the 2022 baseline, notably the recent JIT/interpreter consistency work.WohlSoft's UTF-8 path patch ships in this drop via a new
lj_fopen.c/lj_fopen.hpair (included bylib_package.c,lib_io.c,lj_clib.c,lj_load.c,lj_trace.c) but stays dormant. CCCP's build doesn't defineLUAJIT_FORCE_UTF8_FOPEN, so_lua_fopen/_lua_freopenmacro to plainfopen/freopen, identical to upstream LuaJIT's Windows behavior. Available as a future toggle if we ever want UTF-8 Windows paths.Added
lj_fopen.ctosrc/meson.build+libluajit.vcxproj. CCCP build glue (meson.build,meson_options.txt,libluajit.vcxproj,msvc-prebuild.bat,msvc-postbuild.bat) preserved.src/luajit.hregenerated from the newluajit_rolling.htemplate (rolling version1777102609matchingdfcb8651).Rebuilt
_Bin/*.libso Windows still links. Follow-up PR drops the prebuilts entirely and wireslibluajit.vcxprojintoRTEA.slnso MSBuild source-builds LuaJIT alongside the Meson flow.Built clean on Windows MSBuild (Final, Debug Full, Debug Minimal, Debug Release; all x64) and Linux Meson via WSL2. macOS deferred to CI.
If WohlSoft hasn't picked up the late-May 2026 upstream sanitizer fixes by the time this lands, can do a small follow-up to sync those.