diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-30 10:02:39 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-30 10:35:07 +0100 |
| commit | 1e340f85df7db29ca1db6bf1350bf046c5023fbb (patch) | |
| tree | 91d26492588ccb01f26d09237717d6593124c1b5 /main/minetest/shared-lua.patch | |
| parent | e36d9c05404d489f0ae12e62568553216a925f5f (diff) | |
| download | aports-1e340f85df7db29ca1db6bf1350bf046c5023fbb.tar.bz2 aports-1e340f85df7db29ca1db6bf1350bf046c5023fbb.tar.xz | |
main/minetest: various fixes
- fix segfault due to JIT and PaX. Use shared lua instead of luajit
- clean up init.d script. rename to minitest-server
- use shared irrlicht
- move pre-install script to -server subpackage
- start with gameid 'minimal' by default for testing
Diffstat (limited to 'main/minetest/shared-lua.patch')
| -rw-r--r-- | main/minetest/shared-lua.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/main/minetest/shared-lua.patch b/main/minetest/shared-lua.patch new file mode 100644 index 0000000000..c31c8514ea --- /dev/null +++ b/main/minetest/shared-lua.patch @@ -0,0 +1,37 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -215,8 +215,6 @@ + message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}") + else (NOT ${DISABLE_LUAJIT} MATCHES "1") + message (STATUS "LuaJIT detection disabled! (DISABLE_LUAJIT=1)") +- set(LUA_LIBRARY "") +- set(LUA_INCLUDE_DIR "") + endif (NOT DISABLE_LUAJIT) + + set(USE_LUAJIT 0) +@@ -267,11 +265,22 @@ + endif (VALID_LUAJIT_VERSION) + endif (LUA_LIBRARY AND LUA_INCLUDE_DIR) + ++OPTION(WITH_BUNDLED_LUA "Use bundled lua") ++ + if(NOT USE_LUAJIT) + message (STATUS "LuaJIT not found, using bundled Lua.") +- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") +- set(LUA_LIBRARY "lua") +- add_subdirectory(lua) ++ if (WITH_BUNDLED_LUA) ++ set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") ++ set(LUA_LIBRARY "lua") ++ add_subdirectory(lua) ++ else (WITH_BUNDLED_LUA) ++ find_package(Lua51) ++ if(LUA51_FOUND) ++ message (STATUS "Lua51 found") ++ else(LUA51_FOUND) ++ message (FATAL_ERROR "Lua51 not found!") ++ endif(LUA51_FOUND) ++ endif(WITH_BUNDLED_LUA) + endif(NOT USE_LUAJIT) + + mark_as_advanced(LUA_LIBRARY) |