| diff -Naur lua-5.1.4.org/Makefile lua-5.1.4/Makefile |
| --- lua-5.1.4.org/Makefile 2009-11-24 23:49:28.232820455 +0100 |
| +++ lua-5.1.4/Makefile 2009-11-24 23:50:35.452817115 +0100 |
| @@ -43,7 +43,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.$R |
| TO_MAN= lua.1 luac.1 |
| |
| # Lua version and release. |
| @@ -63,6 +63,7 @@ |
| cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) |
| cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) |
| cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) |
| + ln -sf liblua.so.$R $(INSTALL_LIB)/liblua.so |
| cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) |
| |
| ranlib: |
| diff -Naur lua-5.1.4.org/src/ldo.h lua-5.1.4/src/ldo.h |
| --- lua-5.1.4.org/src/ldo.h 2009-11-24 23:49:28.232820455 +0100 |
| +++ lua-5.1.4/src/ldo.h 2009-11-24 23:49:54.244818140 +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); |
| diff -Naur lua-5.1.4.org/src/lfunc.h lua-5.1.4/src/lfunc.h |
| --- lua-5.1.4.org/src/lfunc.h 2009-11-24 23:49:28.236815431 +0100 |
| +++ lua-5.1.4/src/lfunc.h 2009-11-24 23:49:54.244818140 +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); |
| diff -Naur lua-5.1.4.org/src/lmem.h lua-5.1.4/src/lmem.h |
| --- lua-5.1.4.org/src/lmem.h 2009-11-24 23:49:28.236815431 +0100 |
| +++ lua-5.1.4/src/lmem.h 2009-11-24 23:49:54.244818140 +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); |
| diff -Naur lua-5.1.4.org/src/lstring.h lua-5.1.4/src/lstring.h |
| --- lua-5.1.4.org/src/lstring.h 2009-11-24 23:49:28.236815431 +0100 |
| +++ lua-5.1.4/src/lstring.h 2009-11-24 23:49:54.244818140 +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 |
| diff -Naur lua-5.1.4.org/src/lundump.h lua-5.1.4/src/lundump.h |
| --- lua-5.1.4.org/src/lundump.h 2009-11-24 23:49:28.232820455 +0100 |
| +++ lua-5.1.4/src/lundump.h 2009-11-24 23:49:54.244818140 +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 */ |
| diff -Naur lua-5.1.4.org/src/Makefile lua-5.1.4/src/Makefile |
| --- lua-5.1.4.org/src/Makefile 2009-11-24 23:49:28.236815431 +0100 |
| +++ lua-5.1.4/src/Makefile 2009-11-24 23:49:54.244818140 +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,14 +49,23 @@ |
| |
| 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) |
| + $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -nostdlib -lgcc |
| + ln -fs $@.$(PKG_VERSION) $@ |
| + |
| +$(LUA_T): $(LUA_O) $(LUA_SO) |
| + $(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LIBS) |
| + |
| +$(LUAC_T): $(LUAC_O) $(LUA_SO) |
| + $(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LIBS) |
| |
| -$(LUAC_T): $(LUAC_O) $(LUA_A) |
| +$(LUAC_T)-host: $(LUAC_O) $(LUA_A) |
| $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) |
| |
| clean: |
| @@ -96,7 +107,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" |
