Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-22 19:44:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

development/lua: Updated to latest patch (-3)

Browse source 
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
ponce 2011-03-31 15:36:02 -05:00 committed by Robby Workman
parent 757fa8f5b7
commit cebd67aab9
2 changed files with 9 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
development/lua/lua.SlackBuild
View file

@ -13,7 +13,7 @@
PRGNAM=lua
VERSION=${VERSION:-5.1.4}
BUILD=${BUILD:-5}
BUILD=${BUILD:-6}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -52,7 +52,7 @@ chown -R root:root .
# apply patch-lua-5.1.4-2
# http://www.lua.org/bugs.html#5.1.4
( cd src ; patch -p0 < $CWD/patch-lua-5.1.4-2 )
( cd src ; patch -p0 < $CWD/patch-lua-5.1.4-3 )
# Fix up a to-be-installed header and the pkgconfig file
sed -i "s|/usr/local|/usr|" src/luaconf.h

37
development/lua/patch-lua-5.1.4-2 → development/lua/patch-lua-5.1.4-3
View file

@ -1,22 +1,22 @@
# patch-lua-5.1.4-2 created 2010-05-14T21:02:40-0300
# patch-lua-5.1.4-3 created 2011-03-16T19:06:31-0300
# apply to a pristine copy of Lua 5.1.4 with:
# wget http://www.lua.org/ftp/lua-5.1.4.tar.gz
# tar zxf lua-5.1.4.tar.gz
# cd lua-5.1.4/src
# wget http://www.lua.org/ftp/patch-lua-5.1.4-2
# patch < patch-lua-5.1.4-2
# wget http://www.lua.org/ftp/patch-lua-5.1.4-3
# patch < patch-lua-5.1.4-3
# use curl -O -R if you don't have wget
--- lcode.c 2007/12/28 15:32:23 2.25.1.3
+++ lcode.c 2009/06/15 14:12:25 2.25.1.4
+++ lcode.c 2011/01/31 14:53:16 2.25.1.5
@@ -1,5 +1,5 @@
/*
-** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $
+** $Id: lcode.c,v 2.25.1.4 2009/06/15 14:12:25 roberto Exp $
+** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $
** Code generator for Lua
** See Copyright Notice in lua.h
*/
@@ -544,15 +544,18 @@
@@ -544,10 +544,6 @@
pc = NO_JUMP; /* always true; do nothing */
break;
}
@ -27,19 +27,7 @@
case VJMP: {
invertjump(fs, e);
pc = e->u.s.info;
break;
}
+ case VFALSE: {
+ if (!hasjumps(e)) {
+ pc = luaK_jump(fs); /* always jump */
+ break;
+ }
+ /* else go through */
+ }
default: {
pc = jumponcond(fs, e, 0);
break;
@@ -572,14 +575,17 @@
@@ -572,10 +568,6 @@
pc = NO_JUMP; /* always false; do nothing */
break;
}
@ -50,17 +38,6 @@
case VJMP: {
pc = e->u.s.info;
break;
}
+ case VTRUE: {
+ if (!hasjumps(e)) {
+ pc = luaK_jump(fs); /* always jump */
+ break;
+ }
+ /* else go through */
+ }
default: {
pc = jumponcond(fs, e, 1);
break;
--- ldblib.c 2008/01/21 13:11:21 1.104.1.3
+++ ldblib.c 2009/08/04 18:50:18 1.104.1.4
@@ -1,5 +1,5 @@