From 4e6bd189c52bc5376a853919b584661661118581 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 28 Nov 2012 21:03:53 +0000 Subject: lua: update to upstream version 5.1.5 * COPYRIGHT: md5sum changed only because (C) years now up to 2012. * MJ: removed trailing whitespaces Signed-off-by: Marko Lindqvist Signed-off-by: Martin Jansa --- .../lua/lua5.1/bitwise_operators.patch | 143 +++++++++------------ meta-oe/recipes-devtools/lua/lua5.1/lua5.1.pc | 2 +- meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb | 49 ------- meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb | 48 +++++++ 4 files changed, 113 insertions(+), 129 deletions(-) delete mode 100644 meta-oe/recipes-devtools/lua/lua5.1_5.1.4.bb create mode 100644 meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb (limited to 'meta-oe/recipes-devtools') diff --git a/meta-oe/recipes-devtools/lua/lua5.1/bitwise_operators.patch b/meta-oe/recipes-devtools/lua/lua5.1/bitwise_operators.patch index 138a2bd54a..4f0331ebb6 100644 --- a/meta-oe/recipes-devtools/lua/lua5.1/bitwise_operators.patch +++ b/meta-oe/recipes-devtools/lua/lua5.1/bitwise_operators.patch @@ -1,8 +1,7 @@ -Index: lua-5.1.4/src/lcode.c -=================================================================== ---- lua-5.1.4.orig/src/lcode.c 2007-12-28 16:32:23.000000000 +0100 -+++ lua-5.1.4/src/lcode.c 2009-01-27 21:15:39.000000000 +0100 -@@ -650,6 +650,17 @@ +diff -Nurd lua-5.1.5/src/lcode.c lua-5.1.5/src/lcode.c +--- lua-5.1.5/src/lcode.c 2011-01-31 16:53:16.000000000 +0200 ++++ lua-5.1.5/src/lcode.c 2012-11-28 21:12:23.958419501 +0200 +@@ -642,6 +642,17 @@ case OP_POW: r = luai_numpow(v1, v2); break; case OP_UNM: r = luai_numunm(v1); break; case OP_LEN: return 0; /* no constant folding for 'len' */ @@ -20,7 +19,7 @@ Index: lua-5.1.4/src/lcode.c default: lua_assert(0); r = 0; break; } if (luai_numisnan(r)) return 0; /* do not attempt to produce NaN */ -@@ -662,7 +673,11 @@ +@@ -654,7 +665,11 @@ if (constfolding(op, e1, e2)) return; else { @@ -32,7 +31,7 @@ Index: lua-5.1.4/src/lcode.c int o1 = luaK_exp2RK(fs, e1); if (o1 > o2) { freeexp(fs, e1); -@@ -698,6 +713,14 @@ +@@ -690,6 +705,14 @@ expdesc e2; e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0; switch (op) { @@ -47,7 +46,7 @@ Index: lua-5.1.4/src/lcode.c case OPR_MINUS: { if (!isnumeral(e)) luaK_exp2anyreg(fs, e); /* cannot operate on non-numeric constants */ -@@ -778,6 +801,14 @@ +@@ -770,6 +793,14 @@ case OPR_DIV: codearith(fs, OP_DIV, e1, e2); break; case OPR_MOD: codearith(fs, OP_MOD, e1, e2); break; case OPR_POW: codearith(fs, OP_POW, e1, e2); break; @@ -62,10 +61,9 @@ Index: lua-5.1.4/src/lcode.c case OPR_EQ: codecomp(fs, OP_EQ, 1, e1, e2); break; case OPR_NE: codecomp(fs, OP_EQ, 0, e1, e2); break; case OPR_LT: codecomp(fs, OP_LT, 1, e1, e2); break; -Index: lua-5.1.4/src/lcode.h -=================================================================== ---- lua-5.1.4.orig/src/lcode.h 2007-12-27 14:02:25.000000000 +0100 -+++ lua-5.1.4/src/lcode.h 2009-01-27 21:15:39.000000000 +0100 +diff -Nurd lua-5.1.5/src/lcode.h lua-5.1.5/src/lcode.h +--- lua-5.1.5/src/lcode.h 2007-12-27 15:02:25.000000000 +0200 ++++ lua-5.1.5/src/lcode.h 2012-11-28 21:12:23.958419501 +0200 @@ -25,6 +25,9 @@ */ typedef enum BinOpr { @@ -89,10 +87,9 @@ Index: lua-5.1.4/src/lcode.h #define getcode(fs,e) ((fs)->f->code[(e)->u.s.info]) -Index: lua-5.1.4/src/ldebug.c -=================================================================== ---- lua-5.1.4.orig/src/ldebug.c 2008-05-08 18:56:26.000000000 +0200 -+++ lua-5.1.4/src/ldebug.c 2009-01-27 21:15:39.000000000 +0100 +diff -Nurd lua-5.1.5/src/ldebug.c lua-5.1.5/src/ldebug.c +--- lua-5.1.5/src/ldebug.c 2008-05-08 19:56:26.000000000 +0300 ++++ lua-5.1.5/src/ldebug.c 2012-11-28 21:12:23.958419501 +0200 @@ -592,6 +592,16 @@ luaG_typeerror(L, p2, "perform arithmetic on"); } @@ -110,10 +107,9 @@ Index: lua-5.1.4/src/ldebug.c int luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) { const char *t1 = luaT_typenames[ttype(p1)]; -Index: lua-5.1.4/src/ldebug.h -=================================================================== ---- lua-5.1.4.orig/src/ldebug.h 2007-12-27 14:02:25.000000000 +0100 -+++ lua-5.1.4/src/ldebug.h 2009-01-27 21:15:39.000000000 +0100 +diff -Nurd lua-5.1.5/src/ldebug.h lua-5.1.5/src/ldebug.h +--- lua-5.1.5/src/ldebug.h 2007-12-27 15:02:25.000000000 +0200 ++++ lua-5.1.5/src/ldebug.h 2012-11-28 21:12:23.958419501 +0200 @@ -30,4 +30,9 @@ LUAI_FUNC int luaG_checkcode (const Proto *pt); LUAI_FUNC int luaG_checkopenop (Instruction i); @@ -124,10 +120,9 @@ Index: lua-5.1.4/src/ldebug.h +#endif + #endif -Index: lua-5.1.4/src/llex.c -=================================================================== ---- lua-5.1.4.orig/src/llex.c 2007-12-27 14:02:25.000000000 +0100 -+++ lua-5.1.4/src/llex.c 2009-01-27 21:15:39.000000000 +0100 +diff -Nurd lua-5.1.5/src/llex.c lua-5.1.5/src/llex.c +--- lua-5.1.5/src/llex.c 2009-11-23 16:58:22.000000000 +0200 ++++ lua-5.1.5/src/llex.c 2012-11-28 21:12:23.958419501 +0200 @@ -39,7 +39,11 @@ "end", "false", "for", "function", "if", "in", "local", "nil", "not", "or", "repeat", @@ -140,7 +135,7 @@ Index: lua-5.1.4/src/llex.c "", "", "", "", NULL }; -@@ -371,6 +375,30 @@ +@@ -373,6 +377,30 @@ if (ls->current != '=') return '='; else { next(ls); return TK_EQ; } } @@ -171,7 +166,7 @@ Index: lua-5.1.4/src/llex.c case '<': { next(ls); if (ls->current != '=') return '<'; -@@ -379,8 +407,9 @@ +@@ -381,8 +409,9 @@ case '>': { next(ls); if (ls->current != '=') return '>'; @@ -182,10 +177,9 @@ Index: lua-5.1.4/src/llex.c case '~': { next(ls); if (ls->current != '=') return '~'; -Index: lua-5.1.4/src/llex.h -=================================================================== ---- lua-5.1.4.orig/src/llex.h 2007-12-27 14:02:25.000000000 +0100 -+++ lua-5.1.4/src/llex.h 2009-01-27 21:15:39.000000000 +0100 +diff -Nurd lua-5.1.5/src/llex.h lua-5.1.5/src/llex.h +--- lua-5.1.5/src/llex.h 2007-12-27 15:02:25.000000000 +0200 ++++ lua-5.1.5/src/llex.h 2012-11-28 21:12:23.962419499 +0200 @@ -28,7 +28,11 @@ TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT, TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE, @@ -198,10 +192,9 @@ Index: lua-5.1.4/src/llex.h TK_NAME, TK_STRING, TK_EOS }; -Index: lua-5.1.4/src/lopcodes.c -=================================================================== ---- lua-5.1.4.orig/src/lopcodes.c 2007-12-27 14:02:25.000000000 +0100 -+++ lua-5.1.4/src/lopcodes.c 2009-01-27 21:15:39.000000000 +0100 +diff -Nurd lua-5.1.5/src/lopcodes.c lua-5.1.5/src/lopcodes.c +--- lua-5.1.5/src/lopcodes.c 2007-12-27 15:02:25.000000000 +0200 ++++ lua-5.1.5/src/lopcodes.c 2012-11-28 21:12:23.962419499 +0200 @@ -32,6 +32,15 @@ "DIV", "MOD", @@ -234,10 +227,9 @@ Index: lua-5.1.4/src/lopcodes.c ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_UNM */ ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_NOT */ ,opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_LEN */ -Index: lua-5.1.4/src/lopcodes.h -=================================================================== ---- lua-5.1.4.orig/src/lopcodes.h 2007-12-27 14:02:25.000000000 +0100 -+++ lua-5.1.4/src/lopcodes.h 2009-01-27 21:15:39.000000000 +0100 +diff -Nurd lua-5.1.5/src/lopcodes.h lua-5.1.5/src/lopcodes.h +--- lua-5.1.5/src/lopcodes.h 2007-12-27 15:02:25.000000000 +0200 ++++ lua-5.1.5/src/lopcodes.h 2012-11-28 21:12:23.962419499 +0200 @@ -174,10 +174,20 @@ OP_DIV,/* A B C R(A) := RK(B) / RK(C) */ OP_MOD,/* A B C R(A) := RK(B) % RK(C) */ @@ -281,10 +273,9 @@ Index: lua-5.1.4/src/lopcodes.h OP_SETLIST,/* A B C R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B */ OP_CLOSE,/* A close all variables in the stack up to (>=) R(A)*/ -Index: lua-5.1.4/src/lparser.c -=================================================================== ---- lua-5.1.4.orig/src/lparser.c 2007-12-28 16:32:23.000000000 +0100 -+++ lua-5.1.4/src/lparser.c 2009-01-27 21:15:39.000000000 +0100 +diff -Nurd lua-5.1.5/src/lparser.c lua-5.1.5/src/lparser.c +--- lua-5.1.5/src/lparser.c 2011-10-21 22:31:42.000000000 +0300 ++++ lua-5.1.5/src/lparser.c 2012-11-28 21:12:23.962419499 +0200 @@ -780,6 +780,9 @@ case TK_NOT: return OPR_NOT; case '-': return OPR_MINUS; @@ -320,10 +311,9 @@ Index: lua-5.1.4/src/lparser.c {10, 9}, {5, 4}, /* power and concat (right associative) */ {3, 3}, {3, 3}, /* equality and inequality */ {3, 3}, {3, 3}, {3, 3}, {3, 3}, /* order */ -Index: lua-5.1.4/src/ltm.c -=================================================================== ---- lua-5.1.4.orig/src/ltm.c 2007-12-27 14:02:25.000000000 +0100 -+++ lua-5.1.4/src/ltm.c 2009-01-27 21:15:39.000000000 +0100 +diff -Nurd lua-5.1.5/src/ltm.c lua-5.1.5/src/ltm.c +--- lua-5.1.5/src/ltm.c 2007-12-27 15:02:25.000000000 +0200 ++++ lua-5.1.5/src/ltm.c 2012-11-28 21:12:23.962419499 +0200 @@ -34,6 +34,9 @@ "__add", "__sub", "__mul", "__div", "__mod", "__pow", "__unm", "__len", "__lt", "__le", @@ -334,10 +324,9 @@ Index: lua-5.1.4/src/ltm.c }; int i; for (i=0; i