From bdba5787663bee20325cabd76ed4661ee8c8dd96 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 22 May 2008 14:20:36 +0000 Subject: add updated lua patchset from Steven Barth (cyrus) as explained in http://lists.openwrt.org/pipermail/openwrt-devel/2008-May/002170.html git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11239 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/lua/patches/010-shared_liblua.patch | 147 ---------------------------- 1 file changed, 147 deletions(-) delete mode 100644 package/lua/patches/010-shared_liblua.patch (limited to 'package/lua/patches/010-shared_liblua.patch') diff --git a/package/lua/patches/010-shared_liblua.patch b/package/lua/patches/010-shared_liblua.patch deleted file mode 100644 index 47b37d235..000000000 --- a/package/lua/patches/010-shared_liblua.patch +++ /dev/null @@ -1,147 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# - -Index: lua-5.1.3/Makefile -=================================================================== ---- lua-5.1.3.orig/Makefile 2008-02-20 00:06:06.000000000 +0100 -+++ lua-5.1.3/Makefile 2008-02-20 00:06:07.000000000 +0100 -@@ -38,7 +38,7 @@ - # What to install. - TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp --TO_LIB= liblua.a -+TO_LIB= liblua.a liblua.so liblua.so.$R - TO_MAN= lua.1 luac.1 - - # Lua version and release. -Index: lua-5.1.3/src/Makefile -=================================================================== ---- lua-5.1.3.orig/src/Makefile 2008-02-20 00:06:06.000000000 +0100 -+++ lua-5.1.3/src/Makefile 2008-02-20 00:06:07.000000000 +0100 -@@ -23,6 +23,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 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 -@@ -33,11 +34,12 @@ - LUA_O= lua.o - - LUAC_T= luac --LUAC_O= luac.o print.o -+LUAC_O= luac.o print.o lopcodes.o - - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) - ALL_A= $(LUA_A) -+ALL_SO= $(LUA_SO) - - default: $(PLAT) - -@@ -47,15 +49,21 @@ - - a: $(ALL_A) - -+so: $(ALL_SO) -+ - $(LUA_A): $(CORE_O) $(LIB_O) - $(AR) $@ $? - $(RANLIB) $@ - --$(LUA_T): $(LUA_O) $(LUA_A) -- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(LD) -o $@.$(PKG_VERSION) -shared -soname="$@.$(PKG_VERSION)" $? -+ ln -fs $@.$(PKG_VERSION) $@ -+ -+$(LUA_T): $(LUA_O) $(LUA_SO) -+ $(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LIBS) - --$(LUAC_T): $(LUAC_O) $(LUA_A) -- $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) -+$(LUAC_T): $(LUAC_O) $(LUA_SO) -+ $(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LIBS) - - clean: - $(RM) $(ALL_T) $(ALL_O) -@@ -96,7 +104,7 @@ - $(MAKE) all MYCFLAGS= - - linux: -- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" -+ $(MAKE) all MYCFLAGS+=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" - - macosx: - $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" -Index: lua-5.1.3/src/ldo.h -=================================================================== ---- lua-5.1.3.orig/src/ldo.h 2008-02-20 00:06:06.000000000 +0100 -+++ lua-5.1.3/src/ldo.h 2008-02-20 00:06:07.000000000 +0100 -@@ -46,7 +46,7 @@ - LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult); - LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize); - LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize); --LUAI_FUNC void luaD_growstack (lua_State *L, int n); -+LUA_API void luaD_growstack (lua_State *L, int n); - - LUAI_FUNC void luaD_throw (lua_State *L, int errcode); - LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud); -Index: lua-5.1.3/src/lfunc.h -=================================================================== ---- lua-5.1.3.orig/src/lfunc.h 2008-02-20 00:06:06.000000000 +0100 -+++ lua-5.1.3/src/lfunc.h 2008-02-20 00:06:07.000000000 +0100 -@@ -18,7 +18,7 @@ - cast(int, sizeof(TValue *)*((n)-1))) - - --LUAI_FUNC Proto *luaF_newproto (lua_State *L); -+LUA_API Proto *luaF_newproto (lua_State *L); - LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e); - LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e); - LUAI_FUNC UpVal *luaF_newupval (lua_State *L); -Index: lua-5.1.3/src/lmem.h -=================================================================== ---- lua-5.1.3.orig/src/lmem.h 2008-02-20 00:06:06.000000000 +0100 -+++ lua-5.1.3/src/lmem.h 2008-02-20 00:06:07.000000000 +0100 -@@ -38,9 +38,9 @@ - ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t)))) - - --LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize, -+LUA_API void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize, - size_t size); --LUAI_FUNC void *luaM_toobig (lua_State *L); -+LUA_API void *luaM_toobig (lua_State *L); - LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size, - size_t size_elem, int limit, - const char *errormsg); -Index: lua-5.1.3/src/lstring.h -=================================================================== ---- lua-5.1.3.orig/src/lstring.h 2008-02-20 00:06:06.000000000 +0100 -+++ lua-5.1.3/src/lstring.h 2008-02-20 00:06:07.000000000 +0100 -@@ -25,7 +25,7 @@ - - LUAI_FUNC void luaS_resize (lua_State *L, int newsize); - LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e); --LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l); -+LUA_API TString *luaS_newlstr (lua_State *L, const char *str, size_t l); - - - #endif -Index: lua-5.1.3/src/lundump.h -=================================================================== ---- lua-5.1.3.orig/src/lundump.h 2008-02-20 00:06:06.000000000 +0100 -+++ lua-5.1.3/src/lundump.h 2008-02-20 00:06:07.000000000 +0100 -@@ -17,7 +17,7 @@ - LUAI_FUNC void luaU_header (char* h); - - /* dump one chunk; from ldump.c */ --LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip); -+LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip); - - #ifdef luac_c - /* print one chunk; from print.c */ -- cgit v1.2.3