diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-22 07:31:18 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-22 07:31:18 +0100 |
| commit | 908778078736bd36f7a60a2d576d415cb8e000fa (patch) | |
| tree | c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch | |
| parent | 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff) | |
gentoo resync : 22.05.2021
Diffstat (limited to 'games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch')
| -rw-r--r-- | games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch b/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch new file mode 100644 index 000000000000..7f49b427e8ee --- /dev/null +++ b/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch @@ -0,0 +1,39 @@ +Upstream build scripts use either system LuaJIT or bundled PUC Lua 5.1. +Make it possible to use the system version of the latter too. + +--- a/cmake/Modules/FindLua.cmake ++++ b/cmake/Modules/FindLua.cmake +@@ -2,27 +2,12 @@ + # This selects LuaJIT by default + + option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE) +-set(USE_LUAJIT FALSE) +-option(REQUIRE_LUAJIT "Require LuaJIT support" FALSE) +-if(REQUIRE_LUAJIT) +- set(ENABLE_LUAJIT TRUE) +-endif() + if(ENABLE_LUAJIT) +- find_package(LuaJIT) +- if(LUAJIT_FOUND) +- set(USE_LUAJIT TRUE) +- message (STATUS "Using LuaJIT provided by system.") +- elseif(REQUIRE_LUAJIT) +- message(FATAL_ERROR "LuaJIT not found whereas REQUIRE_LUAJIT=\"TRUE\" is used.\n" +- "To continue, either install LuaJIT or do not use REQUIRE_LUAJIT=\"TRUE\".") +- endif() ++ find_package(LuaJIT REQUIRED) ++ set(USE_LUAJIT TRUE) ++ message (STATUS "Using LuaJIT provided by system.") + else() +- message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)") +-endif() +- +-if(NOT USE_LUAJIT) +- message(STATUS "LuaJIT not found, using bundled Lua.") +- set(LUA_LIBRARY lua) +- set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/lua/src) +- add_subdirectory(lib/lua) ++ find_package(Lua51 REQUIRED) ++ set(USE_LUAJIT FALSE) ++ message(STATUS "Using Lua5.1 provided by system.") + endif() |