lua-shared-libs.patch 4.9 KB

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