Move buildroot to bsp directory.
This commit is contained in:
30
bsp/buildroot/package/lua/5.1.5/0001-root-path.patch
Normal file
30
bsp/buildroot/package/lua/5.1.5/0001-root-path.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
Adjust installation location to /usr.
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
|
||||
Index: b/etc/lua.pc
|
||||
===================================================================
|
||||
--- a/etc/lua.pc
|
||||
+++ b/etc/lua.pc
|
||||
@@ -8,7 +8,7 @@
|
||||
R= 5.1.5
|
||||
|
||||
# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
|
||||
-prefix= /usr/local
|
||||
+prefix= /usr
|
||||
INSTALL_BIN= ${prefix}/bin
|
||||
INSTALL_INC= ${prefix}/include
|
||||
INSTALL_LIB= ${prefix}/lib
|
||||
Index: b/src/luaconf.h
|
||||
===================================================================
|
||||
--- a/src/luaconf.h
|
||||
+++ b/src/luaconf.h
|
||||
@@ -94,7 +94,7 @@
|
||||
".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
|
||||
|
||||
#else
|
||||
-#define LUA_ROOT "/usr/local/"
|
||||
+#define LUA_ROOT "/usr/"
|
||||
#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
|
||||
#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
|
||||
#define LUA_PATH_DEFAULT \
|
||||
@@ -0,0 +1,78 @@
|
||||
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
|
||||
@@ -44,6 +44,7 @@
|
||||
TO_BIN= lua luac
|
||||
TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
|
||||
TO_LIB= liblua.a
|
||||
+TO_SOLIB = liblua.so.$(R)
|
||||
TO_MAN= lua.1 luac.1
|
||||
|
||||
# Lua version and release.
|
||||
@@ -61,6 +62,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
|
||||
@@ -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
|
||||
@@ -36,8 +37,13 @@
|
||||
LUAC_O= luac.o print.o
|
||||
|
||||
ALL_O= $(CORE_O) $(LIB_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)
|
||||
|
||||
default: $(PLAT)
|
||||
|
||||
@@ -47,12 +53,23 @@
|
||||
|
||||
a: $(ALL_A)
|
||||
|
||||
+so: $(ALL_SO)
|
||||
+
|
||||
$(LUA_A): $(CORE_O) $(LIB_O)
|
||||
$(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
|
||||
$(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 $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
||||
+else
|
||||
+$(LUA_T): $(LUA_O) $(LUA_SO)
|
||||
+ $(CC) -o $@ -L. $(MYLDFLAGS) $(LUA_O) -llua $(LIBS)
|
||||
+endif
|
||||
|
||||
$(LUAC_T): $(LUAC_O) $(LUA_A)
|
||||
$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
|
||||
24
bsp/buildroot/package/lua/5.1.5/0011-linenoise.patch
Normal file
24
bsp/buildroot/package/lua/5.1.5/0011-linenoise.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
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/luaconf.h
|
||||
===================================================================
|
||||
--- a/src/luaconf.h
|
||||
+++ b/src/luaconf.h
|
||||
@@ -279,6 +279,13 @@
|
||||
if (lua_strlen(L,idx) > 0) /* non-empty line? */ \
|
||||
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_strlen(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) \
|
||||
((void)L, fputs(p, stdout), fflush(stdout), /* show prompt */ \
|
||||
46
bsp/buildroot/package/lua/5.1.5/0012-fix-reader-at-eoz.patch
Normal file
46
bsp/buildroot/package/lua/5.1.5/0012-fix-reader-at-eoz.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
When loading a file, Lua may call the reader function again after it returned end of input.
|
||||
|
||||
Fetch from: http://www.lua.org/bugs.html#5.1.5-2
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
|
||||
Index: b/src/lzio.c
|
||||
===================================================================
|
||||
--- a/src/lzio.c
|
||||
+++ b/src/lzio.c
|
||||
@@ -22,10 +22,14 @@
|
||||
size_t size;
|
||||
lua_State *L = z->L;
|
||||
const char *buff;
|
||||
+ if (z->eoz) return EOZ;
|
||||
lua_unlock(L);
|
||||
buff = z->reader(L, z->data, &size);
|
||||
lua_lock(L);
|
||||
- if (buff == NULL || size == 0) return EOZ;
|
||||
+ if (buff == NULL || size == 0) {
|
||||
+ z->eoz = 1; /* avoid calling reader function next time */
|
||||
+ return EOZ;
|
||||
+ }
|
||||
z->n = size - 1;
|
||||
z->p = buff;
|
||||
return char2int(*(z->p++));
|
||||
@@ -51,6 +55,7 @@
|
||||
z->data = data;
|
||||
z->n = 0;
|
||||
z->p = NULL;
|
||||
+ z->eoz = 0;
|
||||
}
|
||||
|
||||
|
||||
Index: b/src/lzio.h
|
||||
===================================================================
|
||||
--- a/src/lzio.h
|
||||
+++ b/src/lzio.h
|
||||
@@ -59,6 +59,7 @@
|
||||
lua_Reader reader;
|
||||
void* data; /* additional data */
|
||||
lua_State *L; /* Lua state (for reader) */
|
||||
+ int eoz; /* true if reader has no more data */
|
||||
};
|
||||
|
||||
|
||||
17
bsp/buildroot/package/lua/5.2.4/0001-root-path.patch
Normal file
17
bsp/buildroot/package/lua/5.2.4/0001-root-path.patch
Normal file
@@ -0,0 +1,17 @@
|
||||
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
|
||||
@@ -100,7 +100,7 @@
|
||||
#else /* }{ */
|
||||
|
||||
#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
|
||||
-#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 \
|
||||
@@ -0,0 +1,78 @@
|
||||
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 ansi bsd 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)
|
||||
40
bsp/buildroot/package/lua/5.2.4/0004-lua-pc.patch
Normal file
40
bsp/buildroot/package/lua/5.2.4/0004-lua-pc.patch
Normal file
@@ -0,0 +1,40 @@
|
||||
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.2
|
||||
+# grep '^R=' ../Makefile
|
||||
+R= 5.2.3
|
||||
+
|
||||
+# 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)
|
||||
26
bsp/buildroot/package/lua/5.2.4/0011-linenoise.patch
Normal file
26
bsp/buildroot/package/lua/5.2.4/0011-linenoise.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
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
|
||||
@@ -72,6 +72,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))
|
||||
+
|
||||
#elif !defined(lua_readline)
|
||||
|
||||
#define lua_readline(L,b,p) \
|
||||
17
bsp/buildroot/package/lua/5.3.2/0001-root-path.patch
Normal file
17
bsp/buildroot/package/lua/5.3.2/0001-root-path.patch
Normal file
@@ -0,0 +1,17 @@
|
||||
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
|
||||
@@ -188,7 +188,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 \
|
||||
@@ -0,0 +1,78 @@
|
||||
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)
|
||||
40
bsp/buildroot/package/lua/5.3.2/0004-lua-pc.patch
Normal file
40
bsp/buildroot/package/lua/5.3.2/0004-lua-pc.patch
Normal file
@@ -0,0 +1,40 @@
|
||||
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.2
|
||||
+
|
||||
+# 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)
|
||||
24
bsp/buildroot/package/lua/5.3.2/0011-linenoise.patch
Normal file
24
bsp/buildroot/package/lua/5.3.2/0011-linenoise.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
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
|
||||
@@ -83,6 +83,13 @@
|
||||
#define lua_saveline(L,line) ((void)L, add_history(line))
|
||||
#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,line) ((void)L, linenoiseHistoryAdd(line))
|
||||
+#define lua_freeline(L,b) ((void)L, free(b))
|
||||
+
|
||||
#else /* }{ */
|
||||
|
||||
#define lua_readline(L,b,p) \
|
||||
71
bsp/buildroot/package/lua/Config.in
Normal file
71
bsp/buildroot/package/lua/Config.in
Normal file
@@ -0,0 +1,71 @@
|
||||
config BR2_PACKAGE_LUA
|
||||
bool "lua"
|
||||
select BR2_PACKAGE_HAS_LUAINTERPRETER
|
||||
help
|
||||
Lua is a powerful, fast, light-weight, embeddable scripting language.
|
||||
|
||||
http://www.lua.org/
|
||||
|
||||
if BR2_PACKAGE_LUA
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
|
||||
default "lua"
|
||||
|
||||
choice
|
||||
prompt "Lua Version"
|
||||
default BR2_PACKAGE_LUA_5_3
|
||||
help
|
||||
Select the version of Lua API/ABI you wish to use.
|
||||
|
||||
config BR2_PACKAGE_LUA_5_1
|
||||
bool "Lua 5.1.x"
|
||||
|
||||
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
|
||||
|
||||
if BR2_PACKAGE_LUA_5_3
|
||||
config BR2_PACKAGE_LUA_32BITS
|
||||
bool "Use 32 bit numbers"
|
||||
default y if !BR2_ARCH_IS_64
|
||||
help
|
||||
Use a 32 bit data type for numbers / integers instead of the
|
||||
default 64 bit type. This option is particularly attractive
|
||||
for small machines and embedded systems.
|
||||
|
||||
endif
|
||||
|
||||
choice
|
||||
prompt "Lua command-line editing"
|
||||
default BR2_PACKAGE_LUA_EDITING_NONE
|
||||
|
||||
config BR2_PACKAGE_LUA_EDITING_NONE
|
||||
bool "none"
|
||||
help
|
||||
None.
|
||||
|
||||
config BR2_PACKAGE_LUA_READLINE
|
||||
bool "readline support"
|
||||
select BR2_PACKAGE_READLINE
|
||||
select BR2_PACKAGE_NCURSES
|
||||
help
|
||||
Enables command-line editing in the Lua interpreter.
|
||||
|
||||
config BR2_PACKAGE_LUA_LINENOISE
|
||||
bool "linenoise support"
|
||||
select BR2_PACKAGE_LINENOISE
|
||||
help
|
||||
Enables command-line editing in the Lua interpreter.
|
||||
|
||||
endchoice
|
||||
|
||||
endif
|
||||
9
bsp/buildroot/package/lua/lua.hash
Normal file
9
bsp/buildroot/package/lua/lua.hash
Normal file
@@ -0,0 +1,9 @@
|
||||
# Hashes from: http://www.lua.org/ftp/
|
||||
md5 33278c2ab5ee3c1a875be8d55c1ca2a1 lua-5.3.2.tar.gz
|
||||
sha1 7a47adef554fdca7d0c5536148de34579134a973 lua-5.3.2.tar.gz
|
||||
|
||||
md5 913fdb32207046b273fdb17aad70be13 lua-5.2.4.tar.gz
|
||||
sha1 ef15259421197e3d85b7d6e4871b8c26fd82c1cf lua-5.2.4.tar.gz
|
||||
|
||||
md5 2e115fe26e435e33b0d5c022e4490567 lua-5.1.5.tar.gz
|
||||
sha1 b3882111ad02ecc6b972f8c1241647905cb2e3fc lua-5.1.5.tar.gz
|
||||
106
bsp/buildroot/package/lua/lua.mk
Normal file
106
bsp/buildroot/package/lua/lua.mk
Normal file
@@ -0,0 +1,106 @@
|
||||
################################################################################
|
||||
#
|
||||
# lua
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
LUA_VERSION = 5.3.2
|
||||
else
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_2),y)
|
||||
LUA_VERSION = 5.2.4
|
||||
else
|
||||
LUA_VERSION = 5.1.5
|
||||
endif
|
||||
endif
|
||||
LUA_SITE = http://www.lua.org/ftp
|
||||
LUA_INSTALL_STAGING = YES
|
||||
LUA_LICENSE = MIT
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_1),y)
|
||||
LUA_LICENSE_FILES = COPYRIGHT
|
||||
else
|
||||
LUA_LICENSE_FILES = doc/readme.html
|
||||
endif
|
||||
|
||||
LUA_PROVIDES = luainterpreter
|
||||
|
||||
LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_2),y)
|
||||
LUA_CFLAGS += -DLUA_COMPAT_ALL
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
|
||||
LUA_CFLAGS += -DLUA_COMPAT_5_2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
LUA_BUILDMODE = static
|
||||
else
|
||||
LUA_BUILDMODE = dynamic
|
||||
LUA_CFLAGS += -DLUA_USE_DLOPEN
|
||||
LUA_MYLIBS += -ldl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_READLINE),y)
|
||||
LUA_DEPENDENCIES = readline ncurses
|
||||
LUA_MYLIBS += -lreadline -lhistory -lncurses
|
||||
LUA_CFLAGS += -DLUA_USE_READLINE
|
||||
else
|
||||
ifeq ($(BR2_PACKAGE_LUA_LINENOISE),y)
|
||||
LUA_DEPENDENCIES = linenoise
|
||||
LUA_MYLIBS += -llinenoise
|
||||
LUA_CFLAGS += -DLUA_USE_LINENOISE
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_32BITS),y)
|
||||
define LUA_32BITS_LUACONF
|
||||
$(SED) 's/\/\* #define LUA_32BITS \*\//#define LUA_32BITS/' $(@D)/src/luaconf.h
|
||||
endef
|
||||
|
||||
LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF
|
||||
endif
|
||||
|
||||
# We never want to have host-readline and host-ncurses as dependencies
|
||||
# of host-lua.
|
||||
HOST_LUA_DEPENDENCIES =
|
||||
HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX
|
||||
HOST_LUA_MYLIBS = -ldl
|
||||
|
||||
define LUA_BUILD_CMDS
|
||||
$(MAKE) \
|
||||
CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \
|
||||
CFLAGS="$(TARGET_CFLAGS) $(LUA_CFLAGS)" \
|
||||
MYLIBS="$(LUA_MYLIBS)" AR="$(TARGET_CROSS)ar rcu" \
|
||||
BUILDMODE=$(LUA_BUILDMODE) \
|
||||
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
|
||||
endef
|
||||
|
||||
define HOST_LUA_BUILD_CMDS
|
||||
$(MAKE) \
|
||||
CFLAGS="$(HOST_LUA_CFLAGS)" \
|
||||
MYLDFLAGS="$(HOST_LDFLAGS)" \
|
||||
MYLIBS="$(HOST_LUA_MYLIBS)" \
|
||||
BUILDMODE=static \
|
||||
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
|
||||
endef
|
||||
|
||||
define LUA_INSTALL_STAGING_CMDS
|
||||
$(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install
|
||||
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
|
||||
endef
|
||||
|
||||
define LUA_INSTALL_TARGET_CMDS
|
||||
$(MAKE) INSTALL_TOP="$(TARGET_DIR)/usr" -C $(@D) install
|
||||
endef
|
||||
|
||||
define HOST_LUA_INSTALL_CMDS
|
||||
$(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install
|
||||
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
|
||||
$(HOST_DIR)/usr/lib/pkgconfig/lua.pc
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(host-generic-package))
|
||||
Reference in New Issue
Block a user