Skip to content

Commit 47a7e65

Browse files
luajit: update to 2.1.1764511371 (koreader#2224)
LuaJIT/LuaJIT@5c8cee3...b973c62
1 parent 1efc200 commit 47a7e65

File tree

3 files changed

+6
-24
lines changed

3 files changed

+6
-24
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(APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
8-
# Fix https://github.com/LuaJIT/LuaJIT/pull/1355 regression.
9-
list(APPEND PATCH_FILES revert-eec7a80.patch)
10-
endif()
117

128
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
139
# Debugging is a go!
@@ -99,7 +95,7 @@ endif()
9995
append_tree_install_commands(INSTALL_CMD src/jit jit)
10096

10197
external_project(
102-
DOWNLOAD GIT 5c8cee3dffdb3bc6239ecdf48ce9afeb0fb68250
98+
DOWNLOAD GIT b973c6243d4aab73e5c3df0d7264258b0672fa7e
10399
https://github.com/LuaJIT/LuaJIT
104100
PATCH_FILES ${PATCH_FILES}
105101
PATCH_COMMAND ${PATCH_CMD}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/Makefile b/src/Makefile
2-
index e657af13..3af8aaf4 100644
2+
index 969bf289..d5537fc6 100644
33
--- a/src/Makefile
44
+++ b/src/Makefile
55
@@ -211,6 +211,7 @@ TARGET_STCC= $(STATIC_CC)
@@ -10,15 +10,15 @@ index e657af13..3af8aaf4 100644
1010
TARGET_STRIP= $(CROSS)strip
1111

1212
TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib)
13-
@@ -353,6 +354,7 @@ else
13+
@@ -350,6 +351,7 @@ else
1414
endif
1515
ifeq (Linux,$(TARGET_SYS))
1616
TARGET_XLIBS+= -ldl
1717
+ TARGET_STRIP+= --strip-unneeded
1818
endif
1919
ifeq (GNU/kFreeBSD,$(TARGET_SYS))
2020
TARGET_XLIBS+= -ldl
21-
@@ -668,7 +670,7 @@ depend:
21+
@@ -665,7 +667,7 @@ depend:
2222

2323
$(MINILUA_T): $(MINILUA_O)
2424
$(E) "HOSTLINK $@"
@@ -27,7 +27,7 @@ index e657af13..3af8aaf4 100644
2727

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

3232
$(BUILDVM_T): $(BUILDVM_O)
3333
$(E) "HOSTLINK $@"
@@ -36,7 +36,7 @@ index e657af13..3af8aaf4 100644
3636

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

thirdparty/luajit/revert-eec7a80.patch

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

0 commit comments

Comments
 (0)