Skip to content

Commit e438682

Browse files
PatriceJiangminggo
authored andcommitted
upgrade luajit & compile with clang (#172)
1 parent 148ec52 commit e438682

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,8 @@
5353
/contrib/src copy/
5454
**/winrt/install
5555
**/winrt/temp
56-
**/winrt/cmake/install
56+
**/winrt/cmake/install
57+
58+
**/tarballs
59+
/build/android-toolchain*
60+
/contrib/android-*

contrib/src/luajit/SHA512SUMS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ef04db5bee66a6e24da8d488df2c035c9593792dca4cb49955d673281a7c7b00ab40f4a63e699959461da7fb0732cf81ec46808c33b66ae1eaca4ef94d0b61e3 LuaJIT-2.1.0-beta2.tar.gz
1+
c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12 LuaJIT-2.1.0-beta3.tar.gz
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/luaconf.h b/src/luaconf.h
2+
index c2d29d9..6647c52 100644
3+
--- a/src/luaconf.h
4+
+++ b/src/luaconf.h
5+
@@ -102,7 +102,7 @@
6+
7+
/* Note: changing the following defines breaks the Lua 5.1 ABI. */
8+
#define LUA_INTEGER ptrdiff_t
9+
-#define LUA_IDSIZE 60 /* Size of lua_Debug.short_src. */
10+
+#define LUA_IDSIZE 512 /* Size of lua_Debug.short_src. */
11+
/*
12+
** Size of lauxlib and io.* on-stack buffers. Weird workaround to avoid using
13+
** unreasonable amounts of stack space, but still retain ABI compatibility.

contrib/src/luajit/rules.mak

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# luajit
22

3-
LUAJIT_VERSION := 2.1.0-beta2
3+
LUAJIT_VERSION := 2.1.0-beta3
44
LUAJIT_URL := http://luajit.org/download/LuaJIT-$(LUAJIT_VERSION).tar.gz
55

66
$(TARBALLS)/LuaJIT-$(LUAJIT_VERSION).tar.gz:
@@ -16,6 +16,9 @@ endif
1616

1717
ifeq ($(LUAJIT_VERSION),2.1.0-beta2)
1818
$(APPLY) $(SRC)/luajit/luajit-v2.1.0-beta2.patch
19+
endif
20+
ifeq ($(LUAJIT_VERSION),2.1.0-beta3)
21+
$(APPLY) $(SRC)/luajit/luajit-v2.1.0-beta3.patch
1922
endif
2023
$(MOVE)
2124

@@ -68,7 +71,7 @@ endif
6871

6972
.luajit: luajit
7073
ifdef HAVE_ANDROID
71-
cd $< && $(MAKE) -j8 HOST_CC=$(LUAJIT_HOST_CC) CROSS=$(LUAJIT_CROSS_HOST) TARGET_SYS=Linux TARGET_FLAGS=$(LUAJIT_TARGET_FLAGS)
74+
cd $< && $(MAKE) -j8 HOST_CC=$(LUAJIT_HOST_CC) CROSS=$(LUAJIT_CROSS_HOST) CC=clang TARGET_SYS=Linux TARGET_FLAGS=$(LUAJIT_TARGET_FLAGS)
7275
endif
7376

7477
ifdef HAVE_MACOSX

0 commit comments

Comments
 (0)