lua: add 5.3.x serie

Adjust installation location to /usr.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Index: b/src/luaconf.h

===================================================================

--- a/src/luaconf.h

+++ b/src/luaconf.h

@@ -175,7 +175,7 @@

 #else			/* }{ */

-#define LUA_ROOT	"/usr/local/"

+#define LUA_ROOT	"/usr/"

 #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"

 #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"

 #define LUA_PATH_DEFAULT  \

Add the compilation of a shared library.

Compile the lua binary with the shared library.

And install the shared library.

The variable BUILDMODE allows to switch between static and dynamic mode.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Index: b/Makefile

===================================================================

--- a/Makefile

+++ b/Makefile

@@ -42,6 +42,7 @@

 TO_BIN= lua luac

 TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp

 TO_LIB= liblua.a

+TO_SOLIB = liblua.so.$(R)

 TO_MAN= lua.1 luac.1

 # Lua version and release.

@@ -60,6 +61,8 @@

 install: dummy

 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)

 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)

+	test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || :

+	test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || :

 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)

 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)

 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)

Index: b/src/Makefile

===================================================================

--- a/src/Makefile

+++ b/src/Makefile

@@ -29,6 +29,7 @@

 PLATS= aix bsd c89 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,8 +44,13 @@

 LUAC_O=	luac.o

 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)

+ifneq (dynamic,$(BUILDMODE))

 ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)

+else

+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)

+endif

 ALL_A= $(LUA_A)

+ALL_SO= $(LUA_SO)

 # Targets start here.

 default: $(PLAT)

@@ -55,12 +61,23 @@

 a:	$(ALL_A)

+so:	$(ALL_SO)

+

 $(LUA_A): $(BASE_O)

 	$(AR) $@ $(BASE_O)

 	$(RANLIB) $@

+$(LUA_SO): $(CORE_O) $(LIB_O)

+	$(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?

+	ln -fs $@.$(PKG_VERSION) $@

+

+ifneq (dynamic,$(BUILDMODE))

 $(LUA_T): $(LUA_O) $(LUA_A)

 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)

+else

+$(LUA_T): $(LUA_O) $(LUA_SO)

+	$(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS)

+endif

 $(LUAC_T): $(LUAC_O) $(LUA_A)

 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)

add lua.pc

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Index: b/etc/lua.pc

===================================================================

--- /dev/null

+++ b/etc/lua.pc

@@ -0,0 +1,31 @@

+# lua.pc -- pkg-config data for Lua

+

+# vars from install Makefile

+

+# grep '^V=' ../Makefile

+V= 5.3

+# grep '^R=' ../Makefile

+R= 5.3.0

+

+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'

+prefix= /usr

+INSTALL_BIN= ${prefix}/bin

+INSTALL_INC= ${prefix}/include

+INSTALL_LIB= ${prefix}/lib

+INSTALL_MAN= ${prefix}/man/man1

+INSTALL_LMOD= ${prefix}/share/lua/${V}

+INSTALL_CMOD= ${prefix}/lib/lua/${V}

+

+# canonical vars

+exec_prefix=${prefix}

+libdir=${exec_prefix}/lib

+includedir=${prefix}/include

+

+Name: Lua

+Description: An Extensible Extension Language

+Version: ${R}

+Requires: 

+Libs: -L${libdir} -llua -lm

+Cflags: -I${includedir}

+

+# (end of lua.pc)

Add support of linenoise (replace readline)

see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Index: b/src/lua.c

===================================================================

--- a/src/lua.c

+++ b/src/lua.c

@@ -85,6 +85,15 @@

           add_history(lua_tostring(L, idx));  /* add it to history */

 #define lua_freeline(L,b)	((void)L, free(b))

+#elif defined(LUA_USE_LINENOISE)

+

+#include <linenoise.h>

+#define lua_readline(L,b,p)	((void)L, ((b)=linenoise(p)) != NULL)

+#define lua_saveline(L,idx) \

+	if (lua_rawlen(L,idx) > 0)  /* non-empty line? */ \

+	  linenoiseHistoryAdd(lua_tostring(L, idx));  /* add it to history */

+#define lua_freeline(L,b)	((void)L, free(b))

+

 #else				/* }{ */

 #define lua_readline(L,b,p) \

	config BR2_PACKAGE_LUA_5_2

		bool "Lua 5.2.x"

	config BR2_PACKAGE_LUA_5_3

		bool "Lua 5.3.x"

endchoice

config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION

	default "5.1"	if BR2_PACKAGE_LUA_5_1

	default "5.2"	if BR2_PACKAGE_LUA_5_2

	default "5.3"	if BR2_PACKAGE_LUA_5_3

choice

	prompt "Lua command-line editing"