You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

30 lines
950 B

  1. From f47d569311d51ec9ab5dad7452b43c1b5a8290b6 Mon Sep 17 00:00:00 2001
  2. From: Glenn Strauss <gstrauss@gluelogic.com>
  3. Date: Tue, 1 Dec 2020 16:41:58 -0500
  4. Subject: [PATCH] [PATCH] [meson] do not search for lua versions
  5. openwrt net/lighttpd/Makefile declares dependency on liblua, and not on
  6. specific lua versions, so have meson.build look for 'lua' and not for
  7. specific lua versions.
  8. Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
  9. ---
  10. src/meson.build | 2 +-
  11. 1 file changed, 1 insertion(+), 1 deletion(-)
  12. diff --git a/src/meson.build b/src/meson.build
  13. index 71e4ec90..14ed9cec 100644
  14. --- a/src/meson.build
  15. +++ b/src/meson.build
  16. @@ -381,7 +381,7 @@ endif
  17. liblua = []
  18. if get_option('with_lua')
  19. found_lua = false
  20. - foreach l: ['lua5.4', 'lua-5.4', 'lua5.3', 'lua-5.3', 'lua5.2', 'lua-5.2', 'lua5.1', 'lua-5.1', 'lua']
  21. + foreach l: ['lua']
  22. if not(found_lua)
  23. liblua = dependency(l, required: false)
  24. if (liblua.found())
  25. --
  26. 2.28.0