Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -2846,10 +2846,11 @@
},
"lua": {
"dependency_names": [
"lua-5.4",
"lua-5.5",
"lua"
],
"versions": [
"5.5.0-1",
"5.4.8-1",
"5.4.6-5",
"5.4.6-4",
Expand Down
11 changes: 5 additions & 6 deletions subprojects/lua.wrap
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[wrap-file]
directory = lua-5.4.8
source_url = https://www.lua.org/ftp/lua-5.4.8.tar.gz
source_filename = lua-5.4.8.tar.gz
source_hash = 4f18ddae154e793e46eeab727c59ef1c0c0c2b744e7b94219710d76f530629ae
directory = lua-5.5.0
source_url = https://www.lua.org/ftp/lua-5.5.0.tar.gz
source_filename = lua-5.5.0.tar.gz
source_hash = 57ccc32bbbd005cab75bcc52444052535af691789dba2b9016d5c50640d68b3d
patch_directory = lua

[provide]
lua-5.4 = lua_dep
lua = lua_dep
dependency_names = lua, lua-5.5
27 changes: 13 additions & 14 deletions subprojects/packagefiles/lua/meson.build
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
project(
'lua-5.4',
'lua',
'c',
license: 'MIT',
meson_version: '>=0.49.2',
version: '5.4.8',
meson_version: '>=0.63.0',

Check notice on line 5 in subprojects/packagefiles/lua/meson.build

View workflow job for this annotation

GitHub Actions / Ubuntu (x86_64)

Minimum Meson version is 0.63.0

0.56.0: oldest version supported by WrapDB 0.62.0: dep 'dl' custom lookup 0.63.0: c_std in subproject default_options
version: '5.5.0',
default_options: ['c_std=c99', 'warning_level=2'],
)

Expand Down Expand Up @@ -49,17 +49,10 @@
),
]

if meson.version().version_compare('>= 0.62')
dl_dep = dependency(
'dl',
required: get_option('loadlib'),
)
else
dl_dep = cc.find_library(
'dl',
required: get_option('loadlib'),
)
endif
dl_dep = dependency(
'dl',
required: get_option('loadlib'),
)

if dl_dep.found()
lua_lib_deps += dl_dep
Expand Down Expand Up @@ -135,6 +128,12 @@
include_directories: inc,
)

meson.override_dependency('lua', lua_dep)
meson.override_dependency(
'lua-' + lua_versions[0] + '.' + lua_versions[1],
lua_dep,
)

if get_option('interpreter')
lua_exe = executable(
'lua',
Expand Down