Bump LuaJIT (20210102) (#1282)

And get rid of the verbose mcode patch in debug builds, turns out it's more convenient to just sideload a patched LuaJIT binary on demand.
koreader · Jan 8, 2021 · dec3df4 · dec3df4
1 parent c2bb41a
commit dec3df4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 156 deletions.
diff --git a/thirdparty/luajit/CMakeLists.txt b/thirdparty/luajit/CMakeLists.txt
@@ -71,25 +71,20 @@ set(BUILD_CMD sh -c "${BUILD_CMD_STR}")
 
 set(PATCH_CMD "${KO_PATCH} ${CMAKE_CURRENT_SOURCE_DIR}/koreader-luajit-makefile-tweaks.patch")
 
-# Extra verbose mcode lifecycle information in debug builds, like on Android
-if($ENV{KODEBUG})
-    set(PATCH_CMD_2 "${KO_PATCH} ${CMAKE_CURRENT_SOURCE_DIR}/koreader-luajit-vanilla-mcode-debug.patch")
-endif()
-
 # NOTE: Once the dust settles, all forks seem to lead to https://github.com/moonjit/moonjit
 #       Keep that in mind for later, if the need ever arise...
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME
     https://github.com/LuaJIT/LuaJIT
-    65378759f38bb946e40f31799992434effd01bba
+    1e66d0f9e6698fdee672c40a9a5b4159c9254091
     ${SOURCE_DIR}
 )
 
 include(ExternalProject)
 ExternalProject_Add(
     ${PROJECT_NAME}
     DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
-    PATCH_COMMAND COMMAND ${PATCH_CMD} COMMAND ${PATCH_CMD_2}
+    PATCH_COMMAND COMMAND ${PATCH_CMD}
     BUILD_IN_SOURCE 1
     # skip configure
     CONFIGURE_COMMAND ""

diff --git a/thirdparty/luajit/koreader-luajit-vanilla-mcode-debug.patch b/thirdparty/luajit/koreader-luajit-vanilla-mcode-debug.patch