package/lua/patches/020-shared_liblua.patch

   1 Index: lua-5.1.3/Makefile
   2 ===================================================================
   3 --- lua-5.1.3.orig/Makefile     2008-05-22 15:57:52.000000000 +0200
   4 +++ lua-5.1.3/Makefile  2008-05-22 16:02:53.000000000 +0200
   5 @@ -37,8 +37,8 @@
   6
   7  # What to install.
   8  TO_BIN= lua luac
   9 -TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
  10 -TO_LIB= liblua.a
  11 +TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp lnum_config.h
  12 +TO_LIB= liblua.a liblua.so liblua.so.$R
  13  TO_MAN= lua.1 luac.1
  14
  15  # Lua version and release.
  16 Index: lua-5.1.3/src/ldo.h
  17 ===================================================================
  18 --- lua-5.1.3.orig/src/ldo.h    2008-05-22 15:57:52.000000000 +0200
  19 +++ lua-5.1.3/src/ldo.h 2008-05-22 16:02:53.000000000 +0200
  20 @@ -46,7 +46,7 @@
  21  LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult);
  22  LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize);
  23  LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
  24 -LUAI_FUNC void luaD_growstack (lua_State *L, int n);
  25 +LUA_API void luaD_growstack (lua_State *L, int n);
  26
  27  LUAI_FUNC void luaD_throw (lua_State *L, int errcode);
  28  LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
  29 Index: lua-5.1.3/src/lfunc.h
  30 ===================================================================
  31 --- lua-5.1.3.orig/src/lfunc.h  2008-05-22 15:57:52.000000000 +0200
  32 +++ lua-5.1.3/src/lfunc.h       2008-05-22 16:02:53.000000000 +0200
  33 @@ -18,7 +18,7 @@
  34                           cast(int, sizeof(TValue *)*((n)-1)))
  35
  36
  37 -LUAI_FUNC Proto *luaF_newproto (lua_State *L);
  38 +LUA_API Proto *luaF_newproto (lua_State *L);
  39  LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e);
  40  LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e);
  41  LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
  42 Index: lua-5.1.3/src/lmem.h
  43 ===================================================================
  44 --- lua-5.1.3.orig/src/lmem.h   2008-05-22 15:57:52.000000000 +0200
  45 +++ lua-5.1.3/src/lmem.h        2008-05-22 16:02:53.000000000 +0200
  46 @@ -38,9 +38,9 @@
  47     ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
  48
  49
  50 -LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
  51 +LUA_API void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
  52                                                            size_t size);
  53 -LUAI_FUNC void *luaM_toobig (lua_State *L);
  54 +LUA_API void *luaM_toobig (lua_State *L);
  55  LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
  56                                 size_t size_elem, int limit,
  57                                 const char *errormsg);
  58 Index: lua-5.1.3/src/lstring.h
  59 ===================================================================
  60 --- lua-5.1.3.orig/src/lstring.h        2008-05-22 15:57:52.000000000 +0200
  61 +++ lua-5.1.3/src/lstring.h     2008-05-22 16:02:53.000000000 +0200
  62 @@ -25,7 +25,7 @@
  63
  64  LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
  65  LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
  66 -LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
  67 +LUA_API TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
  68
  69
  70  #endif
  71 Index: lua-5.1.3/src/lundump.h
  72 ===================================================================
  73 --- lua-5.1.3.orig/src/lundump.h        2008-05-22 15:57:52.000000000 +0200
  74 +++ lua-5.1.3/src/lundump.h     2008-05-22 16:02:53.000000000 +0200
  75 @@ -17,7 +17,7 @@
  76  LUAI_FUNC void luaU_header (char* h);
  77
  78  /* dump one chunk; from ldump.c */
  79 -LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
  80 +LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
  81
  82  #ifdef luac_c
  83  /* print one chunk; from print.c */
  84 Index: lua-5.1.3/src/Makefile
  85 ===================================================================
  86 --- lua-5.1.3.orig/src/Makefile 2008-05-22 16:02:53.000000000 +0200
  87 +++ lua-5.1.3/src/Makefile      2008-05-22 16:18:03.000000000 +0200
  88 @@ -23,6 +23,7 @@
  89  PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  90
  91  LUA_A= liblua.a
  92 +LUA_SO= liblua.so
  93  CORE_O=        lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
  94         lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
  95         lundump.o lvm.o lzio.o lnum.o
  96 @@ -33,11 +34,12 @@
  97  LUA_O= lua.o
  98
  99  LUAC_T=        luac
 100 -LUAC_O=        luac.o print.o
 101 +LUAC_O=        luac.o print.o lopcodes.o
 102
 103  ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
 104 -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
 105 +ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
 106  ALL_A= $(LUA_A)
 107 +ALL_SO= $(LUA_SO)
 108
 109  default: $(PLAT)
 110
 111 @@ -47,14 +49,23 @@
 112
 113  a:     $(ALL_A)
 114
 115 +so:    $(ALL_SO)
 116 +
 117  $(LUA_A): $(CORE_O) $(LIB_O)
 118         $(AR) $@ $?
 119         $(RANLIB) $@
 120
 121 -$(LUA_T): $(LUA_O) $(LUA_A)
 122 -       $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
 123 +$(LUA_SO): $(CORE_O) $(LIB_O)
 124 +       $(CC) -o $@.$(PKG_VERSION) -shared -soname="$@.$(PKG_VERSION)" $? -nostdlib -lgcc
 125 +       ln -fs $@.$(PKG_VERSION) $@
 126 +
 127 +$(LUA_T): $(LUA_O) $(LUA_SO)
 128 +       $(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUA_O) $(LIBS)
 129 +
 130 +$(LUAC_T): $(LUAC_O) $(LUA_SO)
 131 +       $(CC) -o $@ -L. -llua $(MYLDFLAGS) $(LUAC_O) $(LIBS)
 132
 133 -$(LUAC_T): $(LUAC_O) $(LUA_A)
 134 +$(LUAC_T)-host: $(LUAC_O) $(LUA_A)
 135         $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
 136
 137  clean:
 138 @@ -96,7 +107,7 @@
 139         $(MAKE) all MYCFLAGS=
 140
 141  linux:
 142 -       $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
 143 +       $(MAKE) all MYCFLAGS+=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
 144
 145  macosx:
 146         $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"