Skip to content

Commit 1ccc79f

Browse files
luajit: update to 2.1.1762864024 (#2215)
LuaJIT/LuaJIT@25a61a1...eba91fc
1 parent b90797b commit 1ccc79f

File tree

5 files changed

+10
-449
lines changed

5 files changed

+10
-449
lines changed

thirdparty/luajit/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ set(BINARY_DIR ${SOURCE_DIR})
44
list(APPEND PATCH_FILES koreader-luajit-makefile-tweaks.patch)
55
# Enable table.pack & table.unpack w/o the rest of the -DLUAJIT_ENABLE_LUA52COMPAT baggage...
66
list(APPEND PATCH_FILES koreader-luajit-enable-table_pack.patch)
7-
if(ANDROID)
8-
list(APPEND PATCH_FILES koreader-luajit-mcode-reserve-hack.patch)
9-
# list(APPEND PATCH_FILES koreader-luajit-mcode-debug.patch)
10-
endif()
117
if(APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
128
# Fix https://github.com/LuaJIT/LuaJIT/pull/1355 regression.
139
list(APPEND PATCH_FILES revert-eec7a80.patch)
@@ -103,7 +99,7 @@ endif()
10399
append_tree_install_commands(INSTALL_CMD src/jit jit)
104100

105101
external_project(
106-
DOWNLOAD GIT 25a61a182166fec06f1a1a025eb8fabbb6cf483e
102+
DOWNLOAD GIT eba91fceb67a0a0163a9222869bf254c988c48c4
107103
https://github.com/LuaJIT/LuaJIT
108104
PATCH_FILES ${PATCH_FILES}
109105
PATCH_COMMAND ${PATCH_CMD}

thirdparty/luajit/koreader-luajit-makefile-tweaks.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/Makefile b/src/Makefile
2-
index d23e0db2..923b7b98 100644
2+
index e657af13..3af8aaf4 100644
33
--- a/src/Makefile
44
+++ b/src/Makefile
55
@@ -211,6 +211,7 @@ TARGET_STCC= $(STATIC_CC)
@@ -18,7 +18,7 @@ index d23e0db2..923b7b98 100644
1818
endif
1919
ifeq (GNU/kFreeBSD,$(TARGET_SYS))
2020
TARGET_XLIBS+= -ldl
21-
@@ -664,7 +666,7 @@ depend:
21+
@@ -668,7 +670,7 @@ depend:
2222

2323
$(MINILUA_T): $(MINILUA_O)
2424
$(E) "HOSTLINK $@"
@@ -27,7 +27,7 @@ index d23e0db2..923b7b98 100644
2727

2828
luajit.h: $(MINILUA_DEP) $(GIT_DEP) luajit_rolling.h
2929
$(E) "VERSION $@"
30-
@@ -679,7 +681,7 @@ host/buildvm.o: $(DASM_DIR)/dasm_*.h
30+
@@ -683,7 +685,7 @@ host/buildvm.o: $(DASM_DIR)/dasm_*.h
3131

3232
$(BUILDVM_T): $(BUILDVM_O)
3333
$(E) "HOSTLINK $@"
@@ -36,7 +36,7 @@ index d23e0db2..923b7b98 100644
3636

3737
$(LJVM_BOUT): $(BUILDVM_T)
3838
$(E) "BUILDVM $@"
39-
@@ -740,16 +742,17 @@ include Makefile.dep
39+
@@ -744,16 +746,17 @@ include Makefile.dep
4040
$(LUAJIT_A): $(LJVMCORE_O)
4141
$(E) "AR $@"
4242
$(Q)$(TARGET_AR) $@ $(LJVMCORE_O)

thirdparty/luajit/koreader-luajit-mcode-debug.patch

Lines changed: 0 additions & 198 deletions
This file was deleted.

0 commit comments

Comments
 (0)