[SerialICE] Patch set updated for serialice: 00d0dd0 Update to Lua 5.2.0

Thu Aug 16 22:55:50 CEST 2012

Idwer Vollering (vidwer at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1100

-gerrit

commit 00d0dd0434143581d340f34785b6716aba4a38ff
Author: Idwer Vollering <vidwer at gmail.com>
Date:   Thu Aug 16 22:51:43 2012 +0200

    Update to Lua 5.2.0
    
    Update SerialICE to be able to use Lua 5.2.0
    Drop serialice-qemu-0.11.0.diff while we're at it.
    lua-5.2.0-shared.diff is (C) 2012 by Kyösti Mälkki.
    
    Change-Id: I73ad1c61c4399a552c7fa3844049a98d4ac27470
    Signed-off-by: Idwer Vollering <vidwer at gmail.com>
---
 SerialICE/patches/lua-5.2.0-intsize.diff | 20 +++++++++++++++
 SerialICE/patches/lua-5.2.0-shared.diff  | 42 ++++++++++++++++++++++++++++++++
 SerialICE/patches/lua-5.2.0-x64-fix.diff | 12 +++++++++
 SerialICE/patches/serialice.lua-5.2.diff | 13 ++++++++++
 4 files changed, 87 insertions(+)

diff --git a/SerialICE/patches/lua-5.2.0-intsize.diff b/SerialICE/patches/lua-5.2.0-intsize.diff
new file mode 100644
index 0000000..e29ffae
--- /dev/null
+++ b/SerialICE/patches/lua-5.2.0-intsize.diff
@@ -0,0 +1,20 @@
+diff -ur lua-5.2.0/src/luaconf.h lua-5.2.0-shared/src/luaconf.h
+--- lua-5.2.0/src/luaconf.h	2011-12-06 17:58:36.000000000 +0100
++++ lua-5.2.0-shared/src/luaconf.h	2012-06-12 22:25:20.179943819 +0200
+@@ -10,6 +10,7 @@
+ 
+ #include <limits.h>
+ #include <stddef.h>
++#include <stdint.h>
+ 
+ 
+ /*
+@@ -444,7 +445,7 @@
+ ** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
+ ** machines, ptrdiff_t gives a good choice between int or long.)
+ */
+-#define LUA_INTEGER	ptrdiff_t
++#define LUA_INTEGER	int64_t
+ 
+ /*
+ @@ LUA_UNSIGNED is the integral type used by lua_pushunsigned/lua_tounsigned.
diff --git a/SerialICE/patches/lua-5.2.0-shared.diff b/SerialICE/patches/lua-5.2.0-shared.diff
new file mode 100644
index 0000000..465adf2
--- /dev/null
+++ b/SerialICE/patches/lua-5.2.0-shared.diff
@@ -0,0 +1,42 @@
+diff -ur lua-5.2.0/Makefile lua-5.2.0-shared/Makefile
+--- lua-5.2.0/Makefile	2011-11-16 00:38:12.000000000 +0100
++++ lua-5.2.0-shared/Makefile	2012-06-12 21:42:25.953250340 +0200
+@@ -41,7 +41,7 @@
+ # What to install.
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+-TO_LIB= liblua.a
++TO_LIB= liblua.a liblua.so
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+diff -ur lua-5.2.0/src/Makefile lua-5.2.0-shared/src/Makefile
+--- lua-5.2.0/src/Makefile	2011-09-19 14:45:14.000000000 +0200
++++ lua-5.2.0-shared/src/Makefile	2012-06-12 21:44:17.476584177 +0200
+@@ -29,6 +29,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO= liblua.so
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+ 	ltm.o lundump.o lvm.o lzio.o
+@@ -43,7 +44,7 @@
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+ 
+ # Targets start here.
+@@ -59,6 +60,9 @@
+ 	$(AR) $@ $?
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -o $@ -shared $?
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
diff --git a/SerialICE/patches/lua-5.2.0-x64-fix.diff b/SerialICE/patches/lua-5.2.0-x64-fix.diff
new file mode 100644
index 0000000..d649f7a
--- /dev/null
+++ b/SerialICE/patches/lua-5.2.0-x64-fix.diff
@@ -0,0 +1,12 @@
+diff -ur lua-5.2.0/src/Makefile lua-5.2.0-shared/src/Makefile
+--- lua-5.2.0/src/Makefile	2011-09-19 14:45:14.000000000 +0200
++++ lua-5.2.0-shared/src/Makefile	2012-06-12 22:24:16.973276561 +0200
+@@ -103,7 +103,7 @@
+ generic: $(ALL)
+ 
+ linux:
+-	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -lncurses"
++	$(MAKE) $(ALL) SYSCFLAGS="-fPIC -DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -lncurses"
+ 
+ macosx:
+ 	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline"
diff --git a/SerialICE/patches/serialice.lua-5.2.diff b/SerialICE/patches/serialice.lua-5.2.diff
new file mode 100644
index 0000000..dd10e50
--- /dev/null
+++ b/SerialICE/patches/serialice.lua-5.2.diff
@@ -0,0 +1,13 @@
+diff --git a/SerialICE/scripts/serialice.lua b/SerialICE/scripts/serialice.lua
+index 0e7e902..947f6a8 100644
+--- a/SerialICE/scripts/serialice.lua
++++ b/SerialICE/scripts/serialice.lua
+@@ -26,7 +26,7 @@ io.write("SerialICE: Starting LUA script\n")
+ 
+ -- If you get an error here, install bitlib 
+ -- (ie. http://luaforge.net/projects/bitlib/)
+-require("bit")
++require("bit32")
+ 
+ function printf(s,...)
+ 	return io.write(s:format(...))

