Skip to contentSkip to conversation

lua5.1: Reintroduce and make it coexist with lua 5.3

PATCH Superseded Khem Raj 1 participant 1 message Oct 28, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 lua5.1: Reintroduce and make it coexist with lua 5.3

many modules still depend on lua5.1 and especially luajit only supports 5.1 ABI as of now with no future plans to move to later ABIs in sight.

This can now coexist with latest lua peacefully,
and also install a symlink to act default system wide lua if someone choose to not install default lua ( 5.3 as of now)

---
 ...04-Fix-stack-overflow-in-vararg-functions.patch |  25 +
 .../lua/lua5.1/bitwise_operators.patch             | 605 +++++++++++++++++++++
 meta-oe/recipes-devtools/lua/lua5.1/lua5.1.pc      |  11 +
 meta-oe/recipes-devtools/lua/lua5.1/luaorg_1.patch |  18 +
 meta-oe/recipes-devtools/lua/lua5.1/luaorg_2.patch |  44 ++
 .../lua/lua5.1/uclibc-pthread.patch                |  13 +
 meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb       |  70 +++
 7 files changed, 786 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/lua/lua5.1/0004-Fix-stack-overflow-in-vararg-functions.patch
 create mode 100644 meta-oe/recipes-devtools/lua/lua5.1/bitwise_operators.patch
 create mode 100644 meta-oe/recipes-devtools/lua/lua5.1/lua5.1.pc
 create mode 100644 meta-oe/recipes-devtools/lua/lua5.1/luaorg_1.patch
 create mode 100644 meta-oe/recipes-devtools/lua/lua5.1/luaorg_2.patch
 create mode 100644 meta-oe/recipes-devtools/lua/lua5.1/uclibc-pthread.patch
 create mode 100644 meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb
meta-oe/recipes-devtools/lua/lua5.1/0004-Fix-stack-overflow-in-vararg-functions.patch new file +25 -0
new file mode 100644
index 0000000..b82eee4
@@ -0,0 +1,25 @@
+Upstream-Status: Backport
+
+Not needed in lua 5.3
+
+From: Enrico Tassi <[email protected]>
+Date: Tue, 26 Aug 2014 16:20:55 +0200
+Subject: Fix stack overflow in vararg functions
+
+---
+ src/ldo.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ldo.c b/src/ldo.c
+index d1bf786..30333bf 100644
+--- a/src/ldo.c
++++ b/src/ldo.c
+@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
+     CallInfo *ci;
+     StkId st, base;
+     Proto *p = cl->p;
+-    luaD_checkstack(L, p->maxstacksize);
++    luaD_checkstack(L, p->maxstacksize + p->numparams);
+     func = restorestack(L, funcr);
+     if (!p->is_vararg) {  /* no varargs? */
+       base = func + 1;
meta-oe/recipes-devtools/lua/lua5.1/bitwise_operators.patch new file +605 -0

605 lines not on this page · raw message

meta-oe/recipes-devtools/lua/lua5.1/lua5.1.pc new file +11 -0
new file mode 100644
index 0000000..b7820db
@@ -0,0 +1,11 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include/lua5.1
+
+Name: Lua
+Description: Lua language engine
+Version: 5.1.5
+Requires:
+Libs: -L${libdir} -llua5.1
+Libs.private: -lm
+Cflags: -I${includedir}/lua5.1
meta-oe/recipes-devtools/lua/lua5.1/luaorg_1.patch new file +18 -0
new file mode 100644
index 0000000..b64a6a2
@@ -0,0 +1,18 @@
+lua.org patch 1 for lua-5.1.5.
+from http://www.lua.org/bugs.html
+
+Upstream-Status: Backport
+
+Signed-off-by: Marko Lindqvist <[email protected]>
+diff -Nurd lua-5.1.5/src/Makefile lua-5.1.5/src/Makefile
+--- lua-5.1.5/src/Makefile	2012-02-13 22:41:22.000000000 +0200
++++ lua-5.1.5/src/Makefile	2013-10-25 11:29:49.769540434 +0300
+@@ -48,7 +48,7 @@
+ a:	$(ALL_A)
+ 
+ $(LUA_A): $(CORE_O) $(LIB_O)
+-	$(AR) $@ $(CORE_O) $(LIB_O)	# DLL needs all object files
++	$(AR) $@ $(CORE_O) $(LIB_O)
+ 	$(RANLIB) $@
+ 
+ $(LUA_T): $(LUA_O) $(LUA_A)
meta-oe/recipes-devtools/lua/lua5.1/luaorg_2.patch new file +44 -0

44 lines not on this page · raw message

meta-oe/recipes-devtools/lua/lua5.1/uclibc-pthread.patch new file +13 -0
new file mode 100644
index 0000000..0555e81
@@ -0,0 +1,13 @@
+Index: lua-5.1.4/src/Makefile
+===================================================================
+--- lua-5.1.4.orig/src/Makefile	2010-10-16 09:51:52.000000000 +0200
++++ lua-5.1.4/src/Makefile	2010-10-16 09:52:15.000000000 +0200
+@@ -12,7 +12,7 @@
+ AR= ar rcu
+ RANLIB= ranlib
+ RM= rm -f
+-LIBS= -lm $(MYLIBS)
++LIBS= -lm -lpthread $(MYLIBS)
+ 
+ MYCFLAGS=
+ MYLDFLAGS=
meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb new file +70 -0

70 lines not on this page · raw message

Signature · 1 line
2.6.2