diff options
| author | tobil4sk <tobil4sk@outlook.com> | 2026-02-03 22:47:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-03 19:47:50 -0300 |
| commit | 47301d83aba58925e1b9594023621ebb27070cdb (patch) | |
| tree | 73021b5366687ec1683b9e66505e74f22f71d31b /vendor | |
| parent | acf1f47e7f1b1ecbc147e41cae51ddfd06ad898d (diff) | |
| download | luarocks-main.tar.gz luarocks-main.tar.bz2 luarocks-main.zip | |
Improve flexibility around vendored librariesmain
compat53 is vendored since #1757 as it is required to run luarocks with lua 5.1 or 5.2.
However, this introduced some issues as the GNUmakefile install rule places these in the same place where `luarocks install compat53` would install them. This means you get conflicts if you install the actual package:
```
Warning: /.../prefix/share/lua/5.1/compat53/init.lua is not tracked by this installation of LuaRocks. Moving it to /.../prefix/share/lua/5.1/compat53/init.lua~
Warning: /.../prefix/share/lua/5.1/compat53/module.lua is not tracked by this installation of LuaRocks. Moving it to /.../prefix/share/lua/5.1/compat53/module.lua~
Warning: /.../prefix/share/lua/5.1/compat53/file_mt.lua is not tracked by this installation of LuaRocks. Moving it to /.../prefix/share/lua/5.1/compat53/file_mt.lua~
```
It is also not ideal for linux package maintainers to include a vendored package, see: https://github.com/luarocks/luarocks/pull/1757#issuecomment-3409873412.
To solve these issues, this patchset makes the following changes:
- GNUmakefile now places the compat53 files under `luarocks/vendor/compat53` (which is added internally to the luarocks script's `package.path`). This way a user's installation of compat53 does not interfere at all with luarocks one.
- Added `--with-system-compat53` option to configure script for external packaging systems.
- Fixed install.bat's logic for deciding whether to vendor compat53, as the current script includes it for every version.
install.bat already places luarocks sources outside of LUAPATH, so that part can stay as is.
I've also inverted the version check to avoid the need for future patches like: #1850.
Diffstat (limited to '')
| -rw-r--r-- | vendor/argparse.d.tl (renamed from src/luarocks/vendor/argparse.d.tl) | 0 | ||||
| -rw-r--r-- | vendor/argparse.lua (renamed from src/luarocks/vendor/argparse.lua) | 0 | ||||
| -rw-r--r-- | vendor/compat53/file_mt.lua (renamed from src/compat53/file_mt.lua) | 0 | ||||
| -rw-r--r-- | vendor/compat53/init.lua (renamed from src/compat53/init.lua) | 0 | ||||
| -rw-r--r-- | vendor/compat53/module.lua (renamed from src/compat53/module.lua) | 0 | ||||
| -rw-r--r-- | vendor/dkjson.d.tl (renamed from src/luarocks/vendor/dkjson.d.tl) | 0 | ||||
| -rw-r--r-- | vendor/dkjson.lua (renamed from src/luarocks/vendor/dkjson.lua) | 0 |
7 files changed, 0 insertions, 0 deletions
diff --git a/src/luarocks/vendor/argparse.d.tl b/vendor/argparse.d.tl index 812786c4..812786c4 100644 --- a/src/luarocks/vendor/argparse.d.tl +++ b/vendor/argparse.d.tl | |||
diff --git a/src/luarocks/vendor/argparse.lua b/vendor/argparse.lua index 2c2585dd..2c2585dd 100644 --- a/src/luarocks/vendor/argparse.lua +++ b/vendor/argparse.lua | |||
diff --git a/src/compat53/file_mt.lua b/vendor/compat53/file_mt.lua index 6433619d..6433619d 100644 --- a/src/compat53/file_mt.lua +++ b/vendor/compat53/file_mt.lua | |||
diff --git a/src/compat53/init.lua b/vendor/compat53/init.lua index b5075713..b5075713 100644 --- a/src/compat53/init.lua +++ b/vendor/compat53/init.lua | |||
diff --git a/src/compat53/module.lua b/vendor/compat53/module.lua index b580e536..b580e536 100644 --- a/src/compat53/module.lua +++ b/vendor/compat53/module.lua | |||
diff --git a/src/luarocks/vendor/dkjson.d.tl b/vendor/dkjson.d.tl index 4245e8aa..4245e8aa 100644 --- a/src/luarocks/vendor/dkjson.d.tl +++ b/vendor/dkjson.d.tl | |||
diff --git a/src/luarocks/vendor/dkjson.lua b/vendor/dkjson.lua index 7a867241..7a867241 100644 --- a/src/luarocks/vendor/dkjson.lua +++ b/vendor/dkjson.lua | |||