lua
cover lua
patches 1/24 & 2/24 are a split of this one http://patchwork.ozlabs.org/patch/314145/
which was a first step for fixing lua on bfin.
patch 3/24 fixes a issue with scripts of cgilua (not visible on autobuilder). so these 3 patches are good candidate for 2014.02.
patches 4/24 to 7/24 allow luarocks to use host-luajit when luajit is used on target.
patches 8/24 to 24/24 are new packages, all are Lua modules.
Fran?ois
Francois Perrad (24):
lua: remove LUA_INSTALLED_FILES
lua: refactor install steps
luarocks: never wraps script
luajit: refactor without dont-strip.patch
luajit: refactor without shared-lib.patch
luajit: add host-luajit
luarocks: allow to work with host-luajit
ljlinenoise: new package
lpeg: new package
cosmo: new package
lua-iconv: new package
luajson: new package
lualogging: new package
dado: new package
lrandom: new package
lua-testmore: new package
lua-coat: new package
lua-coatpersistent: new package
lua-messagepack: new package
lua-csnappy: new package
lzlib: new package
lunit: new package
lpty: new package
lsqlite3: new package
package/Config.in | 17 ++++++++ package/cosmo/Config.in | 7 ++++ package/cosmo/cosmo.mk | 10 +++++ package/dado/Config.in | 6 +++ package/dado/dado.mk | 10 +++++ package/ljlinenoise/Config.in | 15 +++++++ package/ljlinenoise/ljlinenoise.mk | 13 +++++++ package/lpeg/Config.in | 8 ++++ package/lpeg/lpeg.mk | 10 +++++ package/lpty/Config.in | 7 ++++ package/lpty/lpty.mk | 13 +++++++ package/lrandom/Config.in | 8 ++++ package/lrandom/lrandom.mk | 15 +++++++ package/lsqlite3/Config.in | 8 ++++ package/lsqlite3/lsqlite3.mk | 12 ++++++ package/lua-coat/Config.in | 6 +++ package/lua-coat/lua-coat.mk | 13 +++++++ package/lua-coatpersistent/Config.in | 8 ++++ package/lua-coatpersistent/lua-coatpersistent.mk | 13 +++++++ package/lua-csnappy/Config.in | 8 ++++ package/lua-csnappy/lua-csnappy.mk | 13 +++++++ package/lua-iconv/Config.in | 9 +++++ package/lua-iconv/lua-iconv.mk | 13 +++++++ package/lua-messagepack/Config.in | 7 ++++ package/lua-messagepack/lua-messagepack.mk | 13 +++++++ package/lua-testmore/Config.in | 6 +++ package/lua-testmore/lua-testmore.mk | 13 +++++++ package/lua/5.1.5/lua-02-shared-libs-for-lua.patch | 22 +++++++++++ package/lua/5.2.3/lua-02-shared-libs-for-lua.patch | 22 +++++++++++ package/lua/lua.mk | 41 ++------------------ package/luainterpreter/luainterpreter.mk | 4 ++ package/luajit/luajit-02-shared-lib.patch | 17 -------- package/luajit/luajit-03-dont-strip.patch | 23 ----------- package/luajit/luajit.mk | 12 +++++- package/luajson/Config.in | 8 ++++ package/luajson/luajson.mk | 13 +++++++ package/lualogging/Config.in | 9 +++++ package/lualogging/lualogging.mk | 13 +++++++ package/luarocks/luarocks.mk | 19 ++++++--- package/lunit/Config.in | 10 +++++ package/lunit/lunit.mk | 13 +++++++ package/lzlib/Config.in | 9 +++++ package/lzlib/lzlib.mk | 12 ++++++ 43 files changed, 443 insertions(+), 85 deletions(-) create mode 100644 package/cosmo/Config.in create mode 100644 package/cosmo/cosmo.mk create mode 100644 package/dado/Config.in create mode 100644 package/dado/dado.mk create mode 100644 package/ljlinenoise/Config.in create mode 100644 package/ljlinenoise/ljlinenoise.mk create mode 100644 package/lpeg/Config.in create mode 100644 package/lpeg/lpeg.mk create mode 100644 package/lpty/Config.in create mode 100644 package/lpty/lpty.mk create mode 100644 package/lrandom/Config.in create mode 100644 package/lrandom/lrandom.mk create mode 100644 package/lsqlite3/Config.in create mode 100644 package/lsqlite3/lsqlite3.mk create mode 100644 package/lua-coat/Config.in create mode 100644 package/lua-coat/lua-coat.mk create mode 100644 package/lua-coatpersistent/Config.in create mode 100644 package/lua-coatpersistent/lua-coatpersistent.mk create mode 100644 package/lua-csnappy/Config.in create mode 100644 package/lua-csnappy/lua-csnappy.mk create mode 100644 package/lua-iconv/Config.in create mode 100644 package/lua-iconv/lua-iconv.mk create mode 100644 package/lua-messagepack/Config.in create mode 100644 package/lua-messagepack/lua-messagepack.mk create mode 100644 package/lua-testmore/Config.in create mode 100644 package/lua-testmore/lua-testmore.mk delete mode 100644 package/luajit/luajit-02-shared-lib.patch delete mode 100644 package/luajit/luajit-03-dont-strip.patch create mode 100644 package/luajson/Config.in create mode 100644 package/luajson/luajson.mk create mode 100644 package/lualogging/Config.in create mode 100644 package/lualogging/lualogging.mk create mode 100644 package/lunit/Config.in create mode 100644 package/lunit/lunit.mk create mode 100644 package/lzlib/Config.in create mode 100644 package/lzlib/lzlib.mk
Signature · 1 line
1.7.9.5
PATCH 1/24 lua: remove LUA_INSTALLED_FILES
useless since previous commit (remove uninstall commands)
see http://git.buildroot.net/buildroot/commit/package/lua/lua.mk?id=eb7bd9ef617e5ddc8241981e7896d5b3f30ed9ee
Signed-off-by Francois Perrad <[email protected]>
--- package/lua/lua.mk | 11 ----------- 1 file changed, 11 deletions(-)
package/lua/lua.mk +0 -11
@@ -104,16 +104,5 @@ define HOST_LUA_INSTALL_CMDS $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include/lauxlib.h endef -LUA_INSTALLED_FILES = \ - /usr/include/lua.h \ - /usr/include/luaconf.h \ - /usr/include/lualib.h \ - /usr/include/lauxlib.h \ - /usr/lib/pkgconfig/lua.pc \ - /usr/bin/lua \ - /usr/bin/luac \ - /usr/lib/liblua.a \ - /usr/lib/liblua.so* - $(eval $(generic-package)) $(eval $(host-generic-package))
Signature · 1 line
1.7.9.5
PATCH 1/24 lua: remove LUA_INSTALLED_FILES
Quoted 2 lines · Francois Perrad
useless since previous commit (remove uninstall commands)
see http://git.buildroot.net/buildroot/commit/package/lua/lua.mk?id=eb7bd9ef617e5ddc8241981e7896d5b3f30ed9ee
This should be
Useless since the uninstall commands were removed in eb7bd9ef
Quoted 2 lines
Signed-off-by Francois Perrad <[email protected]>
Quoted 26 lines
--- package/lua/lua.mk | 11 ----------- 1 file changed, 11 deletions(-)package/lua/lua.mk +0
-11@@ -104,16 +104,5 @@ define HOST_LUA_INSTALL_CMDS $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include/lauxlib.h endef -LUA_INSTALLED_FILES = \ - /usr/include/lua.h \ - /usr/include/luaconf.h \ - /usr/include/lualib.h \ - /usr/include/lauxlib.h \ - /usr/lib/pkgconfig/lua.pc \ - /usr/bin/lua \ - /usr/bin/luac \ - /usr/lib/liblua.a \ - /usr/lib/liblua.so* - $(eval $(generic-package)) $(eval $(host-generic-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 2/24 lua: refactor install steps
In reply to Francois Perradsince the commit (lua*: restore version in module paths), the upstream Makefiles are usable for install.
Signed-off-by Francois Perrad <[email protected]>
--- package/lua/5.1.5/lua-02-shared-libs-for-lua.patch | 22 ++++++++++++++ package/lua/5.2.3/lua-02-shared-libs-for-lua.patch | 22 ++++++++++++++ package/lua/lua.mk | 30 ++------------------ 3 files changed, 47 insertions(+), 27 deletions(-)
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +22 -0
@@ -1,8 +1,30 @@ Add the compilation of a shared library. Compile the lua binary with the shared library. +And install the shared library. Signed-off-by: Francois Perrad <[email protected]> +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -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) ++ cd $(INSTALL_LIB) && ln -sf liblua.so.$(R) liblua.so + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + + ranlib: Index: b/src/Makefile =================================================================== --- a/src/Makefile
package/lua/5.2.3/lua-02-shared-libs-for-lua.patch +22 -0
@@ -1,8 +1,30 @@ Add the compilation of a shared library. Compile the lua binary with the shared library. +And install the shared library. Signed-off-by: Francois Perrad <[email protected]> +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -41,7 +41,7 @@ + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.a liblua.so.$(R) + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -62,6 +62,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) ++ cd $(INSTALL_LIB) && ln -sf liblua.so.$(R) liblua.so + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + + uninstall: Index: b/src/Makefile =================================================================== --- a/src/Makefile
package/lua/lua.mk +3 -27
@@ -65,43 +65,19 @@ define HOST_LUA_BUILD_CMDS 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 - $(INSTALL) -m 0755 -D $(@D)/src/lua $(STAGING_DIR)/usr/bin/lua - $(INSTALL) -m 0755 -D $(@D)/src/luac $(STAGING_DIR)/usr/bin/luac - $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ - $(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION) - ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so - $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a - $(INSTALL) -m 0644 -D $(@D)/src/lua.h $(STAGING_DIR)/usr/include/lua.h - $(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include/luaconf.h - $(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(STAGING_DIR)/usr/include/lualib.h - $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h endef define LUA_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua - $(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac - $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ - $(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION) - ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so - mkdir -p $(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER) - mkdir -p $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER) + $(MAKE) INSTALL_TOP="$(TARGET_DIR)/usr" -C $(@D) install endef define HOST_LUA_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/src/lua $(HOST_DIR)/usr/bin/lua - $(INSTALL) -m 0755 -D $(@D)/src/luac $(HOST_DIR)/usr/bin/luac - $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ - $(HOST_DIR)/usr/lib/liblua.so.$(LUA_VERSION) - ln -sf liblua.so.$(LUA_VERSION) $(HOST_DIR)/usr/lib/liblua.so - $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(HOST_DIR)/usr/lib/liblua.a + $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ $(HOST_DIR)/usr/lib/pkgconfig/lua.pc - $(INSTALL) -m 0644 -D $(@D)/src/lua.h $(HOST_DIR)/usr/include/lua.h - $(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(HOST_DIR)/usr/include/luaconf.h - $(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(HOST_DIR)/usr/include/lualib.h - $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include/lauxlib.h endef $(eval $(generic-package))
Signature · 1 line
1.7.9.5
PATCH 2/24 lua: refactor install steps
Quoted 1 line · Francois Perrad
since the commit (lua*: restore version in module paths),
If you refer to a commit, please use its abbreviated sha.
Quoted 20 lines
the upstream Makefiles are usable for install.
Signed-off-by Francois Perrad <[email protected]>--- package/lua/5.1.5/lua-02-shared-libs-for-lua.patch | 22 ++++++++++++++ package/lua/5.2.3/lua-02-shared-libs-for-lua.patch | 22 ++++++++++++++ package/lua/lua.mk | 30 ++------------------ 3 files changed, 47 insertions(+), 27 deletions(-)package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +1
-0@@ -1,8 +1,30 @@ Add the compilation of a shared library. Compile the lua binary with the shared library. +And install the shared library. Signed-off-by: Francois Perrad <[email protected]>
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch line 16
Quoted 10 lines
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +10
-0+Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -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)
I think it's more appropriate to make a separate TO_SOLIB.
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch line 23
Quoted 7 lines
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +7
-0+ 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)
Shouldn't this be INSTALL_EXEC for the .so?
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch line 24
Quoted 1 line
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +1
-0++ cd $(INSTALL_LIB) && ln -sf liblua.so.$(R) liblua.so
Seems more appropriate to me to do
ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so
Not related to this patch, but it seems to me that the .so is built and
installed unconditionally, even on BR2_PREFER_STATIC and BINFMT_FLAT. How can this even work?
Regards,
Arnout
Quoted 93 lines
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +3
-0+ cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + + ranlib: Index: b/src/Makefile =================================================================== --- a/src/Makefilepackage/lua/5.2.3/lua-02-shared-libs-for-lua.patch +22
-0@@ -1,8 +1,30 @@ Add the compilation of a shared library. Compile the lua binary with the shared library. +And install the shared library. Signed-off-by: Francois Perrad <[email protected]> +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -41,7 +41,7 @@ + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.a liblua.so.$(R) + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -62,6 +62,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) ++ cd $(INSTALL_LIB) && ln -sf liblua.so.$(R) liblua.so + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + + uninstall: Index: b/src/Makefile =================================================================== --- a/src/Makefilepackage/lua/lua.mk +3
-27@@ -65,43 +65,19 @@ define HOST_LUA_BUILD_CMDS 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 - $(INSTALL) -m 0755 -D $(@D)/src/lua $(STAGING_DIR)/usr/bin/lua - $(INSTALL) -m 0755 -D $(@D)/src/luac $(STAGING_DIR)/usr/bin/luac - $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ - $(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION) - ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so - $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a - $(INSTALL) -m 0644 -D $(@D)/src/lua.h $(STAGING_DIR)/usr/include/lua.h - $(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include/luaconf.h - $(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(STAGING_DIR)/usr/include/lualib.h - $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h endef define LUA_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua - $(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac - $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ - $(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION) - ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so - mkdir -p $(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER) - mkdir -p $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER) + $(MAKE) INSTALL_TOP="$(TARGET_DIR)/usr" -C $(@D) install endef define HOST_LUA_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/src/lua $(HOST_DIR)/usr/bin/lua - $(INSTALL) -m 0755 -D $(@D)/src/luac $(HOST_DIR)/usr/bin/luac - $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ - $(HOST_DIR)/usr/lib/liblua.so.$(LUA_VERSION) - ln -sf liblua.so.$(LUA_VERSION) $(HOST_DIR)/usr/lib/liblua.so - $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(HOST_DIR)/usr/lib/liblua.a + $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ $(HOST_DIR)/usr/lib/pkgconfig/lua.pc - $(INSTALL) -m 0644 -D $(@D)/src/lua.h $(HOST_DIR)/usr/include/lua.h - $(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(HOST_DIR)/usr/include/luaconf.h - $(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(HOST_DIR)/usr/include/lualib.h - $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include/lauxlib.h endef $(eval $(generic-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 2/24 lua: refactor install steps
Quoted 3 lines · Arnout Vandecappelle
Not related to this patch, but it seems to me that the .so is built and
installed unconditionally, even onBR2_PREFER_STATICandBINFMT_FLAT. How can this even work?
Answering my own question: it can't:
http://autobuild.buildroot.net/results/44e/44e2a79a29172a28ff3024a9d75e89a204efc22d/build-end.log
/home/test/test/2/output/host/usr/bin/bfin-uclinux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe
-Os -Wl,-elf2flt -Wall -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN -c -o
loadlib.o loadlib.c
loadlib.c:61:19: error: dlfcn.h: No such file or directory loadlib.c: In function 'll_unloadlib':
loadlib.c:64: warning: implicit declaration of function 'dlclose' loadlib.c: In function 'll_load':
loadlib.c:69: warning: implicit declaration of function 'dlopen' loadlib.c:69: error: 'RTLD_NOW' undeclared (first use in this function) loadlib.c:69: error: (Each undeclared identifier is reported only once loadlib.c:69: error: for each function it appears in.) loadlib.c:69: warning: initialization makes pointer from integer without a cast
loadlib.c:70: warning: implicit declaration of function 'dlerror' loadlib.c:70: warning: passing argument 2 of 'lua_pushstring' makes pointer from integer without a castloadlib.c: In function 'll_sym':
loadlib.c:76: warning: implicit declaration of function 'dlsym' loadlib.c:77: warning: passing argument 2 of 'lua_pushstring' makes pointer from integer without a cast
Clearly it needs !BR2_PREFER_STATIC. Fix is not entirely trivial because
of the large number of reverse dependencies.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 2/24 lua: refactor install steps
In reply to Arnout Vandecappelle2014-02-25 18:39 GMT+01:00 Arnout Vandecappelle <[email protected]>:
Quoted 25 lines · Francois Perrad
Quoted 1 line
since the commit (lua*: restore version in module paths),
If you refer to a commit, please use its abbreviated sha.
Quoted 20 lines
the upstream Makefiles are usable for install.
Signed-off-by Francois Perrad <[email protected]>--- package/lua/5.1.5/lua-02-shared-libs-for-lua.patch | 22 ++++++++++++++ package/lua/5.2.3/lua-02-shared-libs-for-lua.patch | 22 ++++++++++++++ package/lua/lua.mk | 30 ++------------------ 3 files changed, 47 insertions(+), 27 deletions(-)package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +1
-0@@ -1,8 +1,30 @@ Add the compilation of a shared library. Compile the lua binary with the shared library. +And install the shared library. Signed-off-by: Francois Perrad <[email protected]>
Quoted 12 lines
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch line 16
Quoted 10 lines
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +10
-0+Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -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)I think it's more appropriate to make a separate
TO_SOLIB.
Ok.
Quoted 10 lines
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch line 23
Quoted 8 lines
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +7
-0+ 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)Shouldn't this be
INSTALL_EXECfor the .so?
Ok.
Quoted 5 lines
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch line 24
Quoted 2 lines
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +1
-0++ cd $(INSTALL_LIB) && ln -sf liblua.so.$(R) liblua.soSeems more appropriate to me to do
ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so
Ok.
Quoted 6 lines
Not related to this patch, but it seems to me that the .so is built and
installed unconditionally, even onBR2_PREFER_STATICandBINFMT_FLAT. How can this even work?
You are right. lua doesn't work with Blackfin.
See http://patchwork.ozlabs.org/patch/314146/
Fran?ois.
Quoted 111 lines
Regards,
ArnoutQuoted 83 lines
package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +3
-0+ cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + + ranlib: Index: b/src/Makefile =================================================================== --- a/src/Makefilepackage/lua/5.2.3/lua-02-shared-libs-for-lua.patch +22
-0@@ -1,8 +1,30 @@ Add the compilation of a shared library. Compile the lua binary with the shared library. +And install the shared library. Signed-off-by: Francois Perrad <[email protected]> +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -41,7 +41,7 @@ + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.a liblua.so.$(R) + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -62,6 +62,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) ++ cd $(INSTALL_LIB) && ln -sf liblua.so.$(R) liblua.so + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + + uninstall: Index: b/src/Makefile =================================================================== --- a/src/Makefilepackage/lua/lua.mk +2
-23@@ -65,43 +65,19 @@ define HOST_LUA_BUILD_CMDS 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 - $(INSTALL) -m 0755 -D $(@D)/src/lua $(STAGING_DIR)/usr/bin/lua - $(INSTALL) -m 0755 -D $(@D)/src/luac $(STAGING_DIR)/usr/bin/luac - $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ - $(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION) - ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so - $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a - $(INSTALL) -m 0644 -D $(@D)/src/lua.h $(STAGING_DIR)/usr/include/lua.h - $(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include/luaconf.h - $(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(STAGING_DIR)/usr/include/lualib.h - $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h endef define LUA_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua - $(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac - $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ - $(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION) - ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so - mkdir -p $(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER) - mkdir -p $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER) + $(MAKE) INSTALL_TOP="$(TARGET_DIR)/usr" -C $(@D) install endef define HOST_LUA_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/src/lua $(HOST_DIR)/usr/bin/lua - $(INSTALL) -m 0755 -D $(@D)/src/luac $(HOST_DIR)/usr/bin/luac - $(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \ - $(HOST_DIR)/usr/lib/liblua.so.$(LUA_VERSION) - ln -sf liblua.so.$(LUA_VERSION) $(HOST_DIR)/usr/lib/liblua.so - $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(HOST_DIR)/usr/lib/liblua.apackage/lua/lua.mk define HOST_LUA_BUILD_CMDS · line 83
Quoted 10 lines
package/lua/lua.mk +1
-4+ $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ $(HOST_DIR)/usr/lib/pkgconfig/lua.pc - $(INSTALL) -m 0644 -D $(@D)/src/lua.h $(HOST_DIR)/usr/include/lua.h - $(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(HOST_DIR)/usr/include/luaconf.h - $(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(HOST_DIR)/usr/include/lualib.h - $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include/lauxlib.h endef $(eval $(generic-package))--
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 2/24 lua: refactor install steps
Quoted 6 lines · Fran?ois Perrad
Quoted 4 lines
Quoted 4 lines
Not related to this patch, but it seems to me that the .so is built and
installed unconditionally, even onBR2_PREFER_STATICandBINFMT_FLAT. How can this even work?You are right. lua doesn't work with Blackfin.
See http://patchwork.ozlabs.org/patch/314146/
OK, I'll do a quick review of that patch.
Could you make a series of the first two of these, together with an
update of 314146, to be included in 2014.02?
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 3/24 luarocks: never wraps script
In reply to Francois Perradthis config prevents the introduction of some HOST_DIR paths on target
Signed-off-by Francois Perrad <[email protected]>
--- package/luarocks/luarocks.mk | 1 + 1 file changed, 1 insertion(+)
package/luarocks/luarocks.mk +1 -0
@@ -37,6 +37,7 @@ define HOST_LUAROCKS_INSTALL_CMDS echo "external_deps_dirs = { [[$(STAGING_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE) echo "gcc_rpath = false" >> $(LUAROCKS_CONFIG_FILE) echo "rocks_trees = { [[$(TARGET_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE) + echo "wrap_bin_scripts = false" >> $(LUAROCKS_CONFIG_FILE) endef $(eval $(host-generic-package))
Signature · 1 line
1.7.9.5
PATCH 4/24 luajit: refactor without dont-strip.patch
In reply to Francois Perradthe variable TARGET_STRIP does the job
Signed-off-by Francois Perrad <[email protected]>
--- package/luajit/luajit-03-dont-strip.patch | 23 ----------------------- package/luajit/luajit.mk | 2 +- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 package/luajit/luajit-03-dont-strip.patch
package/luajit/luajit-03-dont-strip.patch deleted +0 -23
@@ -1,23 +0,0 @@ -Don't strip the library and binary - -This allows Buildroot to do it if needed, but only if needed. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -665,12 +665,10 @@ - $(LUAJIT_SO): $(LJVMCORE_O) - $(E) "DYNLINK $@" - $(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO) $(TARGET_ALIBS) -- $(Q)$(TARGET_STRIP) $@ - - $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) - $(E) "LINK $@" - $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) -lluajit -L. $(TARGET_ALIBS) -- $(Q)$(TARGET_STRIP) $@ - $(E) "OK Successfully built LuaJIT" - - ##############################################################################
package/luajit/luajit.mk +1 -1
@@ -37,7 +37,7 @@ define LUAJIT_BUILD_CMDS DYNAMIC_CC="$(TARGET_CC) -fPIC" \ TARGET_LD="$(TARGET_CC)" \ TARGET_AR="$(TARGET_AR) rcus" \ - TARGET_STRIP="$(TARGET_STRIP)" \ + TARGET_STRIP=@: \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ HOST_CC="$(LUAJIT_HOST_CC)" \
Signature · 1 line
1.7.9.5
PATCH 4/24 luajit: refactor without dont-strip.patch
Quoted 43 lines · Francois Perrad
the variable
TARGET_STRIPdoes the jobSigned-off-by Francois Perrad <[email protected]>--- package/luajit/luajit-03-dont-strip.patch | 23 ----------------------- package/luajit/luajit.mk | 2 +- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 package/luajit/luajit-03-dont-strip.patchpackage/luajit/luajit-03-dont-strip.patch deleted +0
-23@@ -1,23 +0,0 @@ -Don't strip the library and binary - -This allows Buildroot to do it if needed, but only if needed. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -665,12 +665,10 @@ - $(LUAJIT_SO): $(LJVMCORE_O) - $(E) "DYNLINK $@" - $(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO) $(TARGET_ALIBS) -- $(Q)$(TARGET_STRIP) $@ - - $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) - $(E) "LINK $@" - $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) -lluajit -L. $(TARGET_ALIBS) -- $(Q)$(TARGET_STRIP) $@ - $(E) "OK Successfully built LuaJIT" - - ##############################################################################package/luajit/luajit.mk +0
-0
package/luajit/luajit.mk define LUAJIT_BUILD_CMDS · line 40
Quoted 5 lines
package/luajit/luajit.mk +1
-1@@ -37,7 +37,7 @@ define LUAJIT_BUILD_CMDS DYNAMIC_CC="$(TARGET_CC) -fPIC" \ TARGET_LD="$(TARGET_CC)" \ TARGET_AR="$(TARGET_AR) rcus" \ - TARGET_STRIP="$(TARGET_STRIP)" \ + TARGET_STRIP=@: \
Hm, why is this needed to begin with? package/Makefile.in setsTARGET_STRIP to strip, sstrip or none according to the config option. So that should work correctly, right?
Of course, that does mean that we don't have unstripped binaries in
staging, but it's the same for all other packages that do stripping.
Regards,
Arnout
Quoted 4 lines
package/luajit/luajit.mk +0
-0TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ HOST_CC="$(LUAJIT_HOST_CC)" \
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 5/24 luajit: refactor without shared-lib.patch
In reply to Francois Perradthe variable BUILDMODE does the job
Signed-off-by Francois Perrad <[email protected]>
--- package/luajit/luajit-02-shared-lib.patch | 17 ----------------- package/luajit/luajit.mk | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 package/luajit/luajit-02-shared-lib.patch
package/luajit/luajit-02-shared-lib.patch deleted +0 -17
@@ -1,17 +0,0 @@ -Compile the luajit binary dynamically against the luajit library - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -669,7 +669,7 @@ - - $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) - $(E) "LINK $@" -- $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_O) $(TARGET_ALIBS) -+ $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) -lluajit -L. $(TARGET_ALIBS) - $(Q)$(TARGET_STRIP) $@ - $(E) "OK Successfully built LuaJIT" -
package/luajit/luajit.mk +1 -0
@@ -44,6 +44,7 @@ define LUAJIT_BUILD_CMDS HOST_CFLAGS="$(HOST_CFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \ $(LUAJIT_NO_LARGEFILE) \ + BUILDMODE=dynamic \ -C $(@D) amalg endef
Signature · 1 line
1.7.9.5
PATCH 5/24 luajit: refactor without shared-lib.patch
Quoted 3 lines · Francois Perrad
the variable BUILDMODE does the job
Signed-off-by Francois Perrad <[email protected]>
Regards,
Arnout
Quoted 42 lines
--- package/luajit/luajit-02-shared-lib.patch | 17 ----------------- package/luajit/luajit.mk | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 package/luajit/luajit-02-shared-lib.patchpackage/luajit/luajit-02-shared-lib.patch deleted +0
-17@@ -1,17 +0,0 @@ -Compile the luajit binary dynamically against the luajit library - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -669,7 +669,7 @@ - - $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) - $(E) "LINK $@" -- $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_O) $(TARGET_ALIBS) -+ $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) -lluajit -L. $(TARGET_ALIBS) - $(Q)$(TARGET_STRIP) $@ - $(E) "OK Successfully built LuaJIT" -package/luajit/luajit.mk +1
-0@@ -44,6 +44,7 @@ define LUAJIT_BUILD_CMDS HOST_CFLAGS="$(HOST_CFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \ $(LUAJIT_NO_LARGEFILE) \ + BUILDMODE=dynamic \ -C $(@D) amalg endef
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 5/24 luajit: refactor without shared-lib.patch
In reply to Francois PerradHi Francois,
Quoted 37 lines · Francois Perrad
the variable BUILDMODE does the job
Signed-off-by Francois Perrad <[email protected]>--- package/luajit/luajit-02-shared-lib.patch | 17 ----------------- package/luajit/luajit.mk | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 package/luajit/luajit-02-shared-lib.patchpackage/luajit/luajit-02-shared-lib.patch deleted +0
-17@@ -1,17 +0,0 @@ -Compile the luajit binary dynamically against the luajit library - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -669,7 +669,7 @@ - - $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) - $(E) "LINK $@" -- $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_O) $(TARGET_ALIBS) -+ $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) -lluajit -L. $(TARGET_ALIBS) - $(Q)$(TARGET_STRIP) $@ - $(E) "OK Successfully built LuaJIT" -package/luajit/luajit.mk +0
-0
package/luajit/luajit.mk define LUAJIT_BUILD_CMDS · line 47
Quoted 4 lines
package/luajit/luajit.mk +1
-0@@ -44,6 +44,7 @@ define LUAJIT_BUILD_CMDS HOST_CFLAGS="$(HOST_CFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \ $(LUAJIT_NO_LARGEFILE) \ + BUILDMODE=dynamic \
AFAICS, luajit can be selected if BR2_PREFER_STATIC_LIB=y. How does this play in such a case?
Regards,
Signature · 1 line
Samuel
PATCH 5/24 luajit: refactor without shared-lib.patch
2014-02-27 10:05 GMT+01:00 Samuel Martin <[email protected]>:
Quoted 39 lines
Hi Francois,
Quoted 36 lines · Francois Perrad
the variable BUILDMODE does the job
Signed-off-by Francois Perrad <[email protected]>--- package/luajit/luajit-02-shared-lib.patch | 17 ----------------- package/luajit/luajit.mk | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 package/luajit/luajit-02-shared-lib.patchpackage/luajit/luajit-02-shared-lib.patch deleted +0
-17@@ -1,17 +0,0 @@ -Compile the luajit binary dynamically against the luajit library - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -669,7 +669,7 @@ - - $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) - $(E) "LINK $@" -- $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_O) $(TARGET_ALIBS) -+ $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) -lluajit -L. $(TARGET_ALIBS) - $(Q)$(TARGET_STRIP) $@ - $(E) "OK Successfully built LuaJIT" -package/luajit/luajit.mk +0
-0
Quoted 9 lines
package/luajit/luajit.mk define LUAJIT_BUILD_CMDS · line 47
Quoted 5 lines
package/luajit/luajit.mk +1
-0@@ -44,6 +44,7 @@ define LUAJIT_BUILD_CMDS HOST_CFLAGS="$(HOST_CFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \ $(LUAJIT_NO_LARGEFILE) \ + BUILDMODE=dynamic \AFAICS, luajit can be selected if BR2_PREFER_STATIC_LIB=y. How does this play in such a case?
I'll add a patch "luajit: handles BR2_PREFER_STATIC_LIB", at this time, the dynamic variant is always built.
Fran?ois
Quoted 9 lines
Regards,
--
Samuel
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 6/24 luajit: add host-luajit
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/luajit/luajit.mk | 9 +++++++++ 1 file changed, 9 insertions(+)
package/luajit/luajit.mk +9 -0
@@ -56,4 +56,13 @@ define LUAJIT_INSTALL_TARGET_CMDS $(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) install endef +define HOST_LUAJIT_BUILD_CMDS + $(MAKE) PREFIX="/usr" BUILDMODE=static -C $(@D) amalg +endef + +define HOST_LUAJIT_INSTALL_CMDS + $(MAKE) PREFIX="/usr" DESTDIR="$(HOST_DIR)" -C $(@D) install +endef + $(eval $(generic-package)) +$(eval $(host-generic-package))
Signature · 1 line
1.7.9.5
PATCH 6/24 luajit: add host-luajit
Quoted 2 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>
You should indicate why host-luajit is needed.
Regards,
Arnout
Quoted 23 lines
--- package/luajit/luajit.mk | 9 +++++++++ 1 file changed, 9 insertions(+)package/luajit/luajit.mk +9
-0@@ -56,4 +56,13 @@ define LUAJIT_INSTALL_TARGET_CMDS $(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) install endef +define HOST_LUAJIT_BUILD_CMDS + $(MAKE) PREFIX="/usr" BUILDMODE=static -C $(@D) amalg +endef + +define HOST_LUAJIT_INSTALL_CMDS + $(MAKE) PREFIX="/usr" DESTDIR="$(HOST_DIR)" -C $(@D) install +endef + $(eval $(generic-package)) +$(eval $(host-generic-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 7/24 luarocks: allow to work with host-luajit
In reply to Francois Perradwhen we use luajit on target
Signed-off-by Francois Perrad <[email protected]>
--- package/luainterpreter/luainterpreter.mk | 4 ++++ package/luarocks/luarocks.mk | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-)
package/luainterpreter/luainterpreter.mk +4 -0
@@ -5,8 +5,12 @@ ############################################################# LUAINTERPRETER_SOURCE = +HOST_LUAINTERPRETER_SOURCE = LUAINTERPRETER_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LUA_INTERPRETER)) LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION)) $(eval $(generic-package)) +$(eval $(host-generic-package)) + +LUA_RUN = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_PACKAGE_PROVIDES_LUA_INTERPRETER))
package/luarocks/luarocks.mk +12 -6
@@ -9,16 +9,22 @@ LUAROCKS_SITE = http://luarocks.org/releases/ LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING -HOST_LUAROCKS_DEPENDENCIES = host-lua luainterpreter +HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter luainterpreter LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua +HOST_LUAROCKS_CONF_OPT = \ + --prefix=$(HOST_DIR)/usr \ + --sysconfdir=$(LUAROCKS_CONFIG_DIR) \ + --with-lua=$(HOST_DIR)/usr + +ifeq ($(BR2_PACKAGE_LUAJIT),y) +HOST_LUAROCKS_CONF_OPT += --lua-suffix=jit +endif + define HOST_LUAROCKS_CONFIGURE_CMDS - cd $(@D) && ./configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(LUAROCKS_CONFIG_DIR) \ - --with-lua=$(HOST_DIR)/usr + cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPT) endef define HOST_LUAROCKS_INSTALL_CMDS
@@ -43,4 +49,4 @@ endef $(eval $(host-generic-package)) LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \ - $(HOST_DIR)/usr/bin/lua $(HOST_DIR)/usr/bin/luarocks + $(LUA_RUN) $(HOST_DIR)/usr/bin/luarocks
Signature · 1 line
1.7.9.5
PATCH 7/24 luarocks: allow to work with host-luajit
Quoted 1 line · Francois Perrad
when we use luajit on target
Can you explain more clearly why this is needed? I.e., why can't you use
host-lua for luarocks to build packages for luajit on the target? You'll need at least two paragraphs to explain that properly. I can write the explanation if you like, only I don't understand myself why it is needed :-)
Quoted 12 lines
Signed-off-by Francois Perrad <[email protected]>--- package/luainterpreter/luainterpreter.mk | 4 ++++ package/luarocks/luarocks.mk | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-)package/luainterpreter/luainterpreter.mk +0
-0
package/luainterpreter/luainterpreter.mk line 14
Quoted 10 lines
package/luainterpreter/luainterpreter.mk +2
-0@@ -5,8 +5,12 @@ ############################################################# LUAINTERPRETER_SOURCE = +HOST_LUAINTERPRETER_SOURCE = LUAINTERPRETER_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LUA_INTERPRETER)) LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION)) $(eval $(generic-package)) +$(eval $(host-generic-package))
This should be a separate patch - with explanation in the commit log! E.g.
luainterpreter: add host-luainterpreter
host-luainterpreter is needed for luarocks to work with the same lua implementation as the one on the target.
package/luainterpreter/luainterpreter.mk line 16
Quoted 2 lines
package/luainterpreter/luainterpreter.mk +2
-0+ +LUA_RUN = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_PACKAGE_PROVIDES_LUA_INTERPRETER))
Wouldn't it be easier to just symlink lua -> luajit in luajit?
Actually, in the luajit Makefile I see:
$(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)
which smells to me as if it is already symlinking...
Quoted 33 lines
package/luarocks/luarocks.mk +11
-5@@ -9,16 +9,22 @@ LUAROCKS_SITE = http://luarocks.org/releases/ LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING -HOST_LUAROCKS_DEPENDENCIES = host-lua luainterpreter +HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter luainterpreter LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua +HOST_LUAROCKS_CONF_OPT = \ + --prefix=$(HOST_DIR)/usr \ + --sysconfdir=$(LUAROCKS_CONFIG_DIR) \ + --with-lua=$(HOST_DIR)/usr + +ifeq ($(BR2_PACKAGE_LUAJIT),y) +HOST_LUAROCKS_CONF_OPT += --lua-suffix=jit +endif + define HOST_LUAROCKS_CONFIGURE_CMDS - cd $(@D) && ./configure \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(LUAROCKS_CONFIG_DIR) \ - --with-lua=$(HOST_DIR)/usr + cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPT) endef define HOST_LUAROCKS_INSTALL_CMDS
package/luarocks/luarocks.mk endef · line 52
Quoted 5 lines
package/luarocks/luarocks.mk +1
-1@@ -43,4 +49,4 @@ endef $(eval $(host-generic-package)) LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \ - $(HOST_DIR)/usr/bin/lua $(HOST_DIR)/usr/bin/luarocks + $(LUA_RUN) $(HOST_DIR)/usr/bin/luarocks
This should be mentioned and explained explicitly in the commit message.
E.g.:
Since the host-lua executable can be either lua or luajit, use $(LUA_RUN) to call it instead of an explicit path.
Unless of course the symlink is installed :-)
Regards,
Arnout
Quoted 1 line
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 8/24 ljlinenoise: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/ljlinenoise/Config.in | 15 +++++++++++++++ package/ljlinenoise/ljlinenoise.mk | 13 +++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 package/ljlinenoise/Config.in create mode 100644 package/ljlinenoise/ljlinenoise.mk
package/Config.in +1 -0
@@ -368,6 +368,7 @@ source "package/cgilua/Config.in" source "package/copas/Config.in" source "package/coxpcall/Config.in" source "package/lbase64/Config.in" +source "package/ljlinenoise/Config.in" source "package/ljsyscall/Config.in" source "package/lua-cjson/Config.in" source "package/lua-ev/Config.in"
package/ljlinenoise/Config.in new file +15 -0
@@ -0,0 +1,15 @@ +config BR2_PACKAGE_LJLINENOISE + bool "ljlinenoise" + select BR2_PACKAGE_LJSYSCALL + # ljsyscall is specifically for LuaJIT, not Lua. + depends on BR2_PACKAGE_LUAJIT + # ljsyscall is only available for some target architectures + depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb + help + ljlinenoise is a pure LuaJIT port of linenoise, + a small alternative to readline and libedit. + + http://fperrad.github.io/ljlinenoise/ + +comment "ljlinenoise needs LuaJIT" + depends on !BR2_PACKAGE_LUAJIT && (BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb)
package/ljlinenoise/ljlinenoise.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# ljlinenoise +# +################################################################################ + +LJLINENOISE_VERSION_UPSTREAM = 0.1.1 +LJLINENOISE_VERSION = $(LJLINENOISE_VERSION_UPSTREAM)-1 +LJLINENOISE_SUBDIR = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM) +LJLINENOISE_LICENSE = MIT +LJLINENOISE_LICENSE_FILES = $(LJLINENOISE_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 8/24 ljlinenoise: new package
Quoted 33 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/ljlinenoise/Config.in | 15 +++++++++++++++ package/ljlinenoise/ljlinenoise.mk | 13 +++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 package/ljlinenoise/Config.in create mode 100644 package/ljlinenoise/ljlinenoise.mkpackage/Config.in +1
-0@@ -368,6 +368,7 @@ source "package/cgilua/Config.in" source "package/copas/Config.in" source "package/coxpcall/Config.in" source "package/lbase64/Config.in" +source "package/ljlinenoise/Config.in" source "package/ljsyscall/Config.in" source "package/lua-cjson/Config.in" source "package/lua-ev/Config.in"package/ljlinenoise/Config.in new file +5
-0@@ -0,0 +1,15 @@ +config BR2_PACKAGE_LJLINENOISE + bool "ljlinenoise" + select BR2_PACKAGE_LJSYSCALL + # ljsyscall is specifically for LuaJIT, not Lua. + depends on BR2_PACKAGE_LUAJIT
package/ljlinenoise/Config.in line 15
Quoted 10 lines
package/ljlinenoise/Config.in new file +10
-0+ # ljsyscall is only available for some target architectures + depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb + help + ljlinenoise is a pure LuaJIT port of linenoise, + a small alternative to readline and libedit. + + http://fperrad.github.io/ljlinenoise/ + +comment "ljlinenoise needs LuaJIT" + depends on !BR2_PACKAGE_LUAJIT && (BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb)
We usually split this in two lines:
depends on !BR2_PACKAGE_LUAJIT depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb
Otherwise, looks good to me.
Regards,
Arnout
Quoted 20 lines
package/ljlinenoise/ljlinenoise.mk new file +13
-0@@ -0,0 +1,13 @@ +################################################################################ +# +# ljlinenoise +# +################################################################################ + +LJLINENOISE_VERSION_UPSTREAM = 0.1.1 +LJLINENOISE_VERSION = $(LJLINENOISE_VERSION_UPSTREAM)-1 +LJLINENOISE_SUBDIR = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM) +LJLINENOISE_LICENSE = MIT +LJLINENOISE_LICENSE_FILES = $(LJLINENOISE_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 9/24 lpeg: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lpeg/Config.in | 8 ++++++++ package/lpeg/lpeg.mk | 10 ++++++++++ 3 files changed, 19 insertions(+) create mode 100644 package/lpeg/Config.in create mode 100644 package/lpeg/lpeg.mk
package/Config.in +1 -0
@@ -370,6 +370,7 @@ source "package/coxpcall/Config.in" source "package/lbase64/Config.in" source "package/ljlinenoise/Config.in" source "package/ljsyscall/Config.in" +source "package/lpeg/Config.in" source "package/lua-cjson/Config.in" source "package/lua-ev/Config.in" source "package/lua-msgpack-native/Config.in"
package/lpeg/Config.in new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_PACKAGE_LPEG + bool "lpeg" + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + help + LPeg is a new pattern-matching library for Lua, + based on Parsing Expression Grammars (PEGs). + + http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html
package/lpeg/lpeg.mk new file +10 -0
@@ -0,0 +1,10 @@ +################################################################################ +# +# lpeg +# +################################################################################ + +LPEG_VERSION = 0.12-1 +LPEG_LICENSE = MIT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 9/24 lpeg: new package
Quoted 2 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>
Actually, everybody: is there any reason why we use python- and perl- as
package name prefixes, but not lua- ? For reference (not that it should influence us), on Debian this package is called lua-lpeg.
Regards,
Arnout
Quoted 51 lines
--- package/Config.in | 1 + package/lpeg/Config.in | 8 ++++++++ package/lpeg/lpeg.mk | 10 ++++++++++ 3 files changed, 19 insertions(+) create mode 100644 package/lpeg/Config.in create mode 100644 package/lpeg/lpeg.mkpackage/Config.in +1
-0@@ -370,6 +370,7 @@ source "package/coxpcall/Config.in" source "package/lbase64/Config.in" source "package/ljlinenoise/Config.in" source "package/ljsyscall/Config.in" +source "package/lpeg/Config.in" source "package/lua-cjson/Config.in" source "package/lua-ev/Config.in" source "package/lua-msgpack-native/Config.in"package/lpeg/Config.in new file +8
-0@@ -0,0 +1,8 @@ +config BR2_PACKAGE_LPEG + bool "lpeg" + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + help + LPeg is a new pattern-matching library for Lua, + based on Parsing Expression Grammars (PEGs). + + http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.htmlpackage/lpeg/lpeg.mk new file +10
-0@@ -0,0 +1,10 @@ +################################################################################ +# +# lpeg +# +################################################################################ + +LPEG_VERSION = 0.12-1 +LPEG_LICENSE = MIT + +$(eval $(luarocks-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Thomas Petazzoni
AppliedPATCH 9/24 lpeg: new package
In reply to Francois PerradDear Francois Perrad,
Quoted 9 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/lpeg/Config.in | 8 ++++++++ package/lpeg/lpeg.mk | 10 ++++++++++ 3 files changed, 19 insertions(+) create mode 100644 package/lpeg/Config.in create mode 100644 package/lpeg/lpeg.mk
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 10/24 cosmo: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/cosmo/Config.in | 7 +++++++ package/cosmo/cosmo.mk | 10 ++++++++++ 3 files changed, 18 insertions(+) create mode 100644 package/cosmo/Config.in create mode 100644 package/cosmo/cosmo.mk
package/Config.in +1 -0
@@ -366,6 +366,7 @@ if BR2_PACKAGE_HAS_LUA_INTERPRETER menu "Lua libraries/modules" source "package/cgilua/Config.in" source "package/copas/Config.in" +source "package/cosmo/Config.in" source "package/coxpcall/Config.in" source "package/lbase64/Config.in" source "package/ljlinenoise/Config.in"
package/cosmo/Config.in new file +7 -0
@@ -0,0 +1,7 @@ +config BR2_PACKAGE_COSMO + bool "cosmo" + select BR2_PACKAGE_LPEG + help + Cosmo is a "safe templates" engine for Lua. + + http://mascarenhas.github.io/cosmo/
package/cosmo/cosmo.mk new file +10 -0
@@ -0,0 +1,10 @@ +################################################################################ +# +# cosmo +# +################################################################################ + +COSMO_VERSION = 13.01.30-1 +COSMO_LICENSE = MIT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 10/24 cosmo: new package
Quoted 28 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/cosmo/Config.in | 7 +++++++ package/cosmo/cosmo.mk | 10 ++++++++++ 3 files changed, 18 insertions(+) create mode 100644 package/cosmo/Config.in create mode 100644 package/cosmo/cosmo.mkpackage/Config.in +1
-0@@ -366,6 +366,7 @@ if BR2_PACKAGE_HAS_LUA_INTERPRETER menu "Lua libraries/modules" source "package/cgilua/Config.in" source "package/copas/Config.in" +source "package/cosmo/Config.in" source "package/coxpcall/Config.in" source "package/lbase64/Config.in" source "package/ljlinenoise/Config.in"package/cosmo/Config.in new file +0
-0
package/cosmo/Config.in line 3
Quoted 3 lines
package/cosmo/Config.in new file +3
-0@@ -0,0 +1,7 @@ +config BR2_PACKAGE_COSMO + bool "cosmo" + select BR2_PACKAGE_LPEG
Mention "run-time dependency only"
Regards,
Arnout
Quoted 21 lines
package/cosmo/Config.in new file +4
-0+ help + Cosmo is a "safe templates" engine for Lua. + + http://mascarenhas.github.io/cosmo/package/cosmo/cosmo.mk new file +10
-0@@ -0,0 +1,10 @@ +################################################################################ +# +# cosmo +# +################################################################################ + +COSMO_VERSION = 13.01.30-1 +COSMO_LICENSE = MIT + +$(eval $(luarocks-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Thomas Petazzoni
AppliedPATCH 10/24 cosmo: new package
In reply to Francois PerradDear Francois Perrad,
Quoted 9 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/cosmo/Config.in | 7 +++++++ package/cosmo/cosmo.mk | 10 ++++++++++ 3 files changed, 18 insertions(+) create mode 100644 package/cosmo/Config.in create mode 100644 package/cosmo/cosmo.mk
Applied, after fixing the suggestion made by Arnout.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 11/24 lua-iconv: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lua-iconv/Config.in | 9 +++++++++ package/lua-iconv/lua-iconv.mk | 13 +++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 package/lua-iconv/Config.in create mode 100644 package/lua-iconv/lua-iconv.mk
package/Config.in +1 -0
@@ -374,6 +374,7 @@ source "package/ljsyscall/Config.in" source "package/lpeg/Config.in" source "package/lua-cjson/Config.in" source "package/lua-ev/Config.in" +source "package/lua-iconv/Config.in" source "package/lua-msgpack-native/Config.in" source "package/luasql-sqlite3/Config.in" source "package/luabitop/Config.in"
package/lua-iconv/Config.in new file +9 -0
@@ -0,0 +1,9 @@ +config BR2_PACKAGE_LUA_ICONV + bool "lua-iconv" + select BR2_PACKAGE_LIBICONV + depends on !BR2_ENABLE_LOCALE + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + help + Lua binding to the POSIX 'iconv' library + + http://ittner.github.io/lua-iconv/
package/lua-iconv/lua-iconv.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# lua-iconv +# +################################################################################ + +LUA_ICONV_VERSION_UPSTREAM = 7 +LUA_ICONV_VERSION = $(LUA_ICONV_VERSION_UPSTREAM)-1 +LUA_ICONV_SUBDIR = lua-iconv-$(LUA_ICONV_VERSION_UPSTREAM) +LUA_ICONV_LICENSE = MIT +LUA_ICONV_LICENSE_FILES = $(LUA_ICONV_SUBDIR)/COPYING + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 11/24 lua-iconv: new package
Quoted 28 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/lua-iconv/Config.in | 9 +++++++++ package/lua-iconv/lua-iconv.mk | 13 +++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 package/lua-iconv/Config.in create mode 100644 package/lua-iconv/lua-iconv.mkpackage/Config.in +1
-0@@ -374,6 +374,7 @@ source "package/ljsyscall/Config.in" source "package/lpeg/Config.in" source "package/lua-cjson/Config.in" source "package/lua-ev/Config.in" +source "package/lua-iconv/Config.in" source "package/lua-msgpack-native/Config.in" source "package/luasql-sqlite3/Config.in" source "package/luabitop/Config.in"package/lua-iconv/Config.in new file +0
-0
package/lua-iconv/Config.in line 4
Quoted 4 lines
package/lua-iconv/Config.in new file +4
-0@@ -0,0 +1,9 @@ +config BR2_PACKAGE_LUA_ICONV + bool "lua-iconv" + select BR2_PACKAGE_LIBICONV + depends on !BR2_ENABLE_LOCALE
Shouldn't this be
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
package/lua-iconv/Config.in line 5
Quoted 1 line
package/lua-iconv/Config.in new file +1
-0+ depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
We don't repeat this for (most) other lua packages, and the condition is
already in package/Config.in, right? Actually, we do it for about half of the lua modules - not very consistent... So, do we add the dependency everywhere (like for python) or nowhere (like for perl)?
Quoted 11 lines
package/lua-iconv/Config.in new file +4
-0+ help + Lua binding to the POSIX 'iconv' library + + http://ittner.github.io/lua-iconv/package/lua-iconv/lua-iconv.mk new file +1
-0@@ -0,0 +1,13 @@ +################################################################################
package/lua-iconv/lua-iconv.mk line 11
Quoted 10 lines
package/lua-iconv/lua-iconv.mk new file +10
-0+# +# lua-iconv +# +################################################################################ + +LUA_ICONV_VERSION_UPSTREAM = 7 +LUA_ICONV_VERSION = $(LUA_ICONV_VERSION_UPSTREAM)-1 +LUA_ICONV_SUBDIR = lua-iconv-$(LUA_ICONV_VERSION_UPSTREAM) +LUA_ICONV_LICENSE = MIT +LUA_ICONV_LICENSE_FILES = $(LUA_ICONV_SUBDIR)/COPYING
Doesn't it have a compile-time dependency on iconv at all? I.e.:
LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
Regards,
Arnout
Quoted 3 lines
package/lua-iconv/lua-iconv.mk new file +2
-0+ +$(eval $(luarocks-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 11/24 lua-iconv: new package
2014-02-27 8:16 GMT+01:00 Arnout Vandecappelle <[email protected]>:
Quoted 28 lines · Francois Perrad
Quoted 27 lines
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/lua-iconv/Config.in | 9 +++++++++ package/lua-iconv/lua-iconv.mk | 13 +++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 package/lua-iconv/Config.in create mode 100644 package/lua-iconv/lua-iconv.mkpackage/Config.in +1
-0@@ -374,6 +374,7 @@ source "package/ljsyscall/Config.in" source "package/lpeg/Config.in" source "package/lua-cjson/Config.in" source "package/lua-ev/Config.in" +source "package/lua-iconv/Config.in" source "package/lua-msgpack-native/Config.in" source "package/luasql-sqlite3/Config.in" source "package/luabitop/Config.in"package/lua-iconv/Config.in new file +0
-0
Quoted 8 lines
package/lua-iconv/Config.in line 4
Quoted 5 lines
package/lua-iconv/Config.in new file +4
-0@@ -0,0 +1,9 @@ +config BR2_PACKAGE_LUA_ICONV + bool "lua-iconv" + select BR2_PACKAGE_LIBICONV + depends on !BR2_ENABLE_LOCALEShouldn't this be
selectBR2_PACKAGE_LIBICONVif !BR2_ENABLE_LOCALE
I don't think,
lua-iconv is binding of iconv, so iconv is not an optional dependency
Quoted 7 lines
package/lua-iconv/Config.in line 5
Quoted 2 lines
package/lua-iconv/Config.in new file +1
-0+ depends on BR2_PACKAGE_HAS_LUA_INTERPRETERWe don't repeat this for (most) other lua packages, and the condition is
already in package/Confi g.in, right? Actually, we do it for about half of the lua modules - not very consistent... So, do we add the dependency everywhere (like for python) or nowhere (like for perl)?
Looks like historical, C native modules have it, pure Lua modules haven't. So a cleanup is needed, and I prefer to remove this dependency everywhere (like for perl).
Quoted 26 lines
Quoted 13 lines
package/lua-iconv/Config.in new file +4
-0+ help + Lua binding to the POSIX 'iconv' library + + http://ittner.github.io/lua-iconv/package/lua-iconv/lua-iconv.mk new file +1
-0@@ -0,0 +1,13 @@ +################################################################################package/lua-iconv/lua-iconv.mk line 11
Quoted 10 lines
package/lua-iconv/lua-iconv.mk new file +10
-0+# +# lua-iconv +# +################################################################################ + +LUA_ICONV_VERSION_UPSTREAM = 7 +LUA_ICONV_VERSION = $(LUA_ICONV_VERSION_UPSTREAM)-1 +LUA_ICONV_SUBDIR = lua-iconv-$(LUA_ICONV_VERSION_UPSTREAM) +LUA_ICONV_LICENSE = MIT +LUA_ICONV_LICENSE_FILES = $(LUA_ICONV_SUBDIR)/COPYINGDoesn't it have a compile-time dependency on iconv at all? I.e.:
Quoted 2 lines
LUA_ICONV_DEPENDENCIES= $(if $(BR2_PACKAGE_LIBICONV),libiconv)
LUA_ICONV_DEPENDENCIES = luainterpreter libiconv
Fran?ois
Quoted 21 lines
Regards,
Arnoutpackage/lua-iconv/lua-iconv.mk line 13
Quoted 3 lines
package/lua-iconv/lua-iconv.mk new file +2
-0+ +$(eval $(luarocks-package))--
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 12/24 luajson: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/luajson/Config.in | 8 ++++++++ package/luajson/luajson.mk | 13 +++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 package/luajson/Config.in create mode 100644 package/luajson/luajson.mk
package/Config.in +1 -0
@@ -382,6 +382,7 @@ source "package/luacrypto/Config.in" source "package/luaexpat/Config.in" source "package/luaexpatutils/Config.in" source "package/luafilesystem/Config.in" +source "package/luajson/Config.in" source "package/luaposix/Config.in" source "package/luasec/Config.in" source "package/luasocket/Config.in"
package/luajson/Config.in new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_PACKAGE_LUAJSON + bool "luajson" + select BR2_PACKAGE_LPEG + help + LuaJSON is a customizable JSON decoder/encoder + using LPEG for parsing. + + http://github.com/harningt/luajson
package/luajson/luajson.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# luajson +# +################################################################################ + +LUAJSON_VERSION_UPSTREAM = 1.3.2 +LUAJSON_VERSION = $(LUAJSON_VERSION_UPSTREAM)-1 +LUAJSON_SUBDIR = luajson +LUAJSON_LICENSE = MIT +LUAJSON_LICENSE_FILES = $(LUAJSON_SUBDIR)/LICENSE + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 12/24 luajson: new package
Quoted 28 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/luajson/Config.in | 8 ++++++++ package/luajson/luajson.mk | 13 +++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 package/luajson/Config.in create mode 100644 package/luajson/luajson.mkpackage/Config.in +1
-0@@ -382,6 +382,7 @@ source "package/luacrypto/Config.in" source "package/luaexpat/Config.in" source "package/luaexpatutils/Config.in" source "package/luafilesystem/Config.in" +source "package/luajson/Config.in" source "package/luaposix/Config.in" source "package/luasec/Config.in" source "package/luasocket/Config.in"package/luajson/Config.in new file +0
-0
package/luajson/Config.in line 3
Quoted 3 lines
package/luajson/Config.in new file +3
-0@@ -0,0 +1,8 @@ +config BR2_PACKAGE_LUAJSON + bool "luajson" + select BR2_PACKAGE_LPEG
# run-time dependency only
Quoted 11 lines
package/luajson/Config.in new file +5
-0+ help + LuaJSON is a customizable JSON decoder/encoder + using LPEG for parsing. + + http://github.com/harningt/luajsonpackage/luajson/luajson.mk new file +0
-0
package/luajson/luajson.mk line 9
Quoted 9 lines
package/luajson/luajson.mk new file +9
-0@@ -0,0 +1,13 @@ +################################################################################ +# +# luajson +# +################################################################################ + +LUAJSON_VERSION_UPSTREAM = 1.3.2 +LUAJSON_VERSION = $(LUAJSON_VERSION_UPSTREAM)-1 +LUAJSON_SUBDIR = luajson
If the upstream version is not included in the subdir, you don't need to
split the version in two parts.
Regards,
Arnout
Quoted 5 lines
package/luajson/luajson.mk new file +4
-0+LUAJSON_LICENSE = MIT +LUAJSON_LICENSE_FILES = $(LUAJSON_SUBDIR)/LICENSE + +$(eval $(luarocks-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Thomas Petazzoni
AppliedPATCH 12/24 luajson: new package
In reply to Francois PerradDear Francois Perrad,
Quoted 9 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/luajson/Config.in | 8 ++++++++ package/luajson/luajson.mk | 13 +++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 package/luajson/Config.in create mode 100644 package/luajson/luajson.mk
Thanks, applied after fixing the two comments made by Arnout.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 13/24 lualogging: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lualogging/Config.in | 9 +++++++++ package/lualogging/lualogging.mk | 13 +++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 package/lualogging/Config.in create mode 100644 package/lualogging/lualogging.mk
package/Config.in +1 -0
@@ -383,6 +383,7 @@ source "package/luaexpat/Config.in" source "package/luaexpatutils/Config.in" source "package/luafilesystem/Config.in" source "package/luajson/Config.in" +source "package/lualogging/Config.in" source "package/luaposix/Config.in" source "package/luasec/Config.in" source "package/luasocket/Config.in"
package/lualogging/Config.in new file +9 -0
@@ -0,0 +1,9 @@ +config BR2_PACKAGE_LUALOGGING + bool "lualogging" + help + LuaLogging provides a simple API to use logging features in Lua. + Its design was based on log4j. LuaLogging currently supports, + through the use of appenders, console, file, rolling file, email, + socket and SQL outputs. + + http://www.keplerproject.org/lualogging/
package/lualogging/lualogging.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# lualogging +# +################################################################################ + +LUALOGGING_VERSION_UPSTREAM = 1.3.0 +LUALOGGING_VERSION = $(LUALOGGING_VERSION_UPSTREAM)-1 +LUALOGGING_SUBDIR = lualogging +LUALOGGING_LICENSE = MIT +LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
Thomas Petazzoni
AppliedPATCH 13/24 lualogging: new package
Dear Francois Perrad,
Quoted 9 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/lualogging/Config.in | 9 +++++++++ package/lualogging/lualogging.mk | 13 +++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 package/lualogging/Config.in create mode 100644 package/lualogging/lualogging.mk
Applied, after simplifying the version specification.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 14/24 dado: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/dado/Config.in | 6 ++++++ package/dado/dado.mk | 10 ++++++++++ 3 files changed, 17 insertions(+) create mode 100644 package/dado/Config.in create mode 100644 package/dado/dado.mk
package/Config.in +1 -0
@@ -368,6 +368,7 @@ source "package/cgilua/Config.in" source "package/copas/Config.in" source "package/cosmo/Config.in" source "package/coxpcall/Config.in" +source "package/dado/Config.in" source "package/lbase64/Config.in" source "package/ljlinenoise/Config.in" source "package/ljsyscall/Config.in"
package/dado/Config.in new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_DADO + bool "dado" + help + Database Facilities for LuaSQL. + + http://www.ccpa.puc-rio.br/software/dado/
package/dado/dado.mk new file +10 -0
@@ -0,0 +1,10 @@ +################################################################################ +# +# dado +# +################################################################################ + +DADO_VERSION = 1.5.2-1 +DADO_LICENSE = MIT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
Thomas Petazzoni
AppliedPATCH 14/24 dado: new package
Dear Francois Perrad,
Quoted 9 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/dado/Config.in | 6 ++++++ package/dado/dado.mk | 10 ++++++++++ 3 files changed, 17 insertions(+) create mode 100644 package/dado/Config.in create mode 100644 package/dado/dado.mk
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 15/24 lrandom: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lrandom/Config.in | 8 ++++++++ package/lrandom/lrandom.mk | 15 +++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 package/lrandom/Config.in create mode 100644 package/lrandom/lrandom.mk
package/Config.in +1 -0
@@ -373,6 +373,7 @@ source "package/lbase64/Config.in" source "package/ljlinenoise/Config.in" source "package/ljsyscall/Config.in" source "package/lpeg/Config.in" +source "package/lrandom/Config.in" source "package/lua-cjson/Config.in" source "package/lua-ev/Config.in" source "package/lua-iconv/Config.in"
package/lrandom/Config.in new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_PACKAGE_LRANDOM + bool "lrandom" + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + help + A library for generating random numbers + based on the Mersenne Twister + + http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lrandom
package/lrandom/lrandom.mk new file +15 -0
@@ -0,0 +1,15 @@ +################################################################################ +# +# lrandom +# +################################################################################ + +ifeq ($(BR2_PACKAGE_LUA_5_2),y) +LRANDOM_VERSION = 20120430.52-1 +else +LRANDOM_VERSION = 20120430.51-1 +endif +LRANDOM_SUBDIR = random +LRANDOM_LICENSE = Public domain + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
Thomas Petazzoni
AppliedPATCH 15/24 lrandom: new package
Dear Francois Perrad,
Quoted 9 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>--- package/Config.in | 1 + package/lrandom/Config.in | 8 ++++++++ package/lrandom/lrandom.mk | 15 +++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 package/lrandom/Config.in create mode 100644 package/lrandom/lrandom.mk
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 16/24 lua-testmore: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lua-testmore/Config.in | 6 ++++++ package/lua-testmore/lua-testmore.mk | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 package/lua-testmore/Config.in create mode 100644 package/lua-testmore/lua-testmore.mk
package/Config.in +1 -0
@@ -378,6 +378,7 @@ source "package/lua-cjson/Config.in" source "package/lua-ev/Config.in" source "package/lua-iconv/Config.in" source "package/lua-msgpack-native/Config.in" +source "package/lua-testmore/Config.in" source "package/luasql-sqlite3/Config.in" source "package/luabitop/Config.in" source "package/luacrypto/Config.in"
package/lua-testmore/Config.in new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_TESTMORE + bool "lua-testmore" + help + an Unit Testing Framework. + + http://fperrad.github.io/lua-TestMore/
package/lua-testmore/lua-testmore.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# lua-testmore +# +################################################################################ + +LUA_TESTMORE_VERSION_UPSTREAM = 0.3.1 +LUA_TESTMORE_VERSION = $(LUA_TESTMORE_VERSION_UPSTREAM)-1 +LUA_TESTMORE_SUBDIR = lua-TestMore-$(LUA_TESTMORE_VERSION_UPSTREAM) +LUA_TESTMORE_LICENSE = MIT +LUA_TESTMORE_LICENSE_FILES = $(LUA_TESTMORE_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 17/24 lua-coat: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lua-coat/Config.in | 6 ++++++ package/lua-coat/lua-coat.mk | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 package/lua-coat/Config.in create mode 100644 package/lua-coat/lua-coat.mk
package/Config.in +1 -0
@@ -375,6 +375,7 @@ source "package/ljsyscall/Config.in" source "package/lpeg/Config.in" source "package/lrandom/Config.in" source "package/lua-cjson/Config.in" +source "package/lua-coat/Config.in" source "package/lua-ev/Config.in" source "package/lua-iconv/Config.in" source "package/lua-msgpack-native/Config.in"
package/lua-coat/Config.in new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_COAT + bool "lua-coat" + help + Yet Another Lua Object-Oriented Model + + http://fperrad.github.io/lua-Coat/
package/lua-coat/lua-coat.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# lua-coat +# +################################################################################ + +LUA_COAT_VERSION_UPSTREAM = 0.9.0 +LUA_COAT_VERSION = $(LUA_COAT_VERSION_UPSTREAM)-1 +LUA_COAT_SUBDIR = lua-Coat-$(LUA_COAT_VERSION_UPSTREAM) +LUA_COAT_LICENSE = MIT +LUA_COAT_LICENSE_FILES = $(LUA_COAT_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 18/24 lua-coatpersistent: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lua-coatpersistent/Config.in | 8 ++++++++ package/lua-coatpersistent/lua-coatpersistent.mk | 13 +++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 package/lua-coatpersistent/Config.in create mode 100644 package/lua-coatpersistent/lua-coatpersistent.mk
package/Config.in +1 -0
@@ -376,6 +376,7 @@ source "package/lpeg/Config.in" source "package/lrandom/Config.in" source "package/lua-cjson/Config.in" source "package/lua-coat/Config.in" +source "package/lua-coatpersistent/Config.in" source "package/lua-ev/Config.in" source "package/lua-iconv/Config.in" source "package/lua-msgpack-native/Config.in"
package/lua-coatpersistent/Config.in new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_PACKAGE_LUA_COATPERSISTENT + bool "lua-coatpersistent" + select BR2_PACKAGE_DADO + select BR2_PACKAGE_LUA_COAT + help + an ORM for lua-Coat + + http://fperrad.github.io/lua-CoatPersistent/
package/lua-coatpersistent/lua-coatpersistent.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# lua-coatpersistent +# +################################################################################ + +LUA_COATPERSISTENT_VERSION_UPSTREAM = 0.2.0 +LUA_COATPERSISTENT_VERSION = $(LUA_COATPERSISTENT_VERSION_UPSTREAM)-1 +LUA_COATPERSISTENT_SUBDIR = lua-CoatPersistent-$(LUA_COATPERSISTENT_VERSION_UPSTREAM) +LUA_COATPERSISTENT_LICENSE = MIT +LUA_COATPERSISTENT_LICENSE_FILES = $(LUA_COATPERSISTENT_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 19/24 lua-messagepack: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lua-messagepack/Config.in | 7 +++++++ package/lua-messagepack/lua-messagepack.mk | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 package/lua-messagepack/Config.in create mode 100644 package/lua-messagepack/lua-messagepack.mk
package/Config.in +1 -0
@@ -379,6 +379,7 @@ source "package/lua-coat/Config.in" source "package/lua-coatpersistent/Config.in" source "package/lua-ev/Config.in" source "package/lua-iconv/Config.in" +source "package/lua-messagepack/Config.in" source "package/lua-msgpack-native/Config.in" source "package/lua-testmore/Config.in" source "package/luasql-sqlite3/Config.in"
package/lua-messagepack/Config.in new file +7 -0
@@ -0,0 +1,7 @@ +config BR2_PACKAGE_LUA_MESSAGEPACK + bool "lua-messagepack" + help + a pure Lua implementation of the MessagePack serialization format + + http://fperrad.github.io/lua-MessagePack/ +
package/lua-messagepack/lua-messagepack.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# lua-messagepack +# +################################################################################ + +LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.3.0 +LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 +LUA_MESSAGEPACK_SUBDIR = lua-MessagePack-$(LUA_MESSAGEPACK_VERSION_UPSTREAM) +LUA_MESSAGEPACK_LICENSE = MIT +LUA_MESSAGEPACK_LICENSE_FILES = $(LUA_MESSAGEPACK_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 20/24 lua-csnappy: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lua-csnappy/Config.in | 8 ++++++++ package/lua-csnappy/lua-csnappy.mk | 13 +++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 package/lua-csnappy/Config.in create mode 100644 package/lua-csnappy/lua-csnappy.mk
package/Config.in +1 -0
@@ -377,6 +377,7 @@ source "package/lrandom/Config.in" source "package/lua-cjson/Config.in" source "package/lua-coat/Config.in" source "package/lua-coatpersistent/Config.in" +source "package/lua-csnappy/Config.in" source "package/lua-ev/Config.in" source "package/lua-iconv/Config.in" source "package/lua-messagepack/Config.in"
package/lua-csnappy/Config.in new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_PACKAGE_LUA_CSNAPPY + bool "lua-csnappy" + help + lua-csnappy is a binding of the csnappy library + which implements the Google's Snappy (de)compressor. + + http://fperrad.github.io/lua-csnappy/ +
package/lua-csnappy/lua-csnappy.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# lua-csnappy +# +################################################################################ + +LUA_CSNAPPY_VERSION_UPSTREAM = 0.1.1 +LUA_CSNAPPY_VERSION = $(LUA_CSNAPPY_VERSION_UPSTREAM)-1 +LUA_CSNAPPY_SUBDIR = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM) +LUA_CSNAPPY_LICENSE = BSD-3c +LUA_CSNAPPY_LICENSE_FILES = $(LUA_CSNAPPY_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 21/24 lzlib: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lzlib/Config.in | 9 +++++++++ package/lzlib/lzlib.mk | 12 ++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 package/lzlib/Config.in create mode 100644 package/lzlib/lzlib.mk
package/Config.in +1 -0
@@ -394,6 +394,7 @@ source "package/lualogging/Config.in" source "package/luaposix/Config.in" source "package/luasec/Config.in" source "package/luasocket/Config.in" +source "package/lzlib/Config.in" source "package/orbit/Config.in" source "package/rings/Config.in" source "package/wsapi/Config.in"
package/lzlib/Config.in new file +9 -0
@@ -0,0 +1,9 @@ +config BR2_PACKAGE_LZLIB + bool "lzlib" + select BR2_PACKAGE_ZLIB + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + help + This package provides a library to access zlib library functions + and also to read/write gzip files using an interface similar to the base io package. + + http://luaforge.net/projects/lzlib/
package/lzlib/lzlib.mk new file +12 -0
@@ -0,0 +1,12 @@ +############################################################# +# +# lzlib +# +############################################################# + +LZLIB_VERSION = 0.4.work3-1 +LZLIB_SUBDIR = lzlib-0.4-work3 +LZLIB_DEPENDENCIES = zlib +LZLIB_LICENSE = MIT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 22/24 lunit: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lunit/Config.in | 10 ++++++++++ package/lunit/lunit.mk | 13 +++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 package/lunit/Config.in create mode 100644 package/lunit/lunit.mk
package/Config.in +1 -0
@@ -394,6 +394,7 @@ source "package/lualogging/Config.in" source "package/luaposix/Config.in" source "package/luasec/Config.in" source "package/luasocket/Config.in" +source "package/lunit/Config.in" source "package/lzlib/Config.in" source "package/orbit/Config.in" source "package/rings/Config.in"
package/lunit/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_LUNIT + bool "lunit" + depends on !BR2_PACKAGE_LUA_5_2 + help + A unit testing framework for Lua. + + http://www.mroth.net/lunit/ + +comment "lunit needs a Lua 5.1 interpreter" + depends on BR2_PACKAGE_LUA_5_2
package/lunit/lunit.mk new file +13 -0
@@ -0,0 +1,13 @@ +############################################################# +# +# lunit +# +############################################################# + +LUNIT_VERSION_UPSTREAM = 0.5 +LUNIT_VERSION = $(LUNIT_VERSION_UPSTREAM)-2 +LUNIT_SUBDIR = lunit-$(LUNIT_VERSION_UPSTREAM) +LUNIT_LICENSE = MIT +LUNIT_LICENSE_FILES = $(LUNIT_SUBDIR)/LICENSE + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 23/24 lpty: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lpty/Config.in | 7 +++++++ package/lpty/lpty.mk | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 package/lpty/Config.in create mode 100644 package/lpty/lpty.mk
package/Config.in +1 -0
@@ -373,6 +373,7 @@ source "package/lbase64/Config.in" source "package/ljlinenoise/Config.in" source "package/ljsyscall/Config.in" source "package/lpeg/Config.in" +source "package/lpty/Config.in" source "package/lrandom/Config.in" source "package/lua-cjson/Config.in" source "package/lua-coat/Config.in"
package/lpty/Config.in new file +7 -0
@@ -0,0 +1,7 @@ +config BR2_PACKAGE_LPTY + bool "lpty" + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + help + A simple facility for lua to control other programs via PTYs. + + http://www.tset.de/lpty/
package/lpty/lpty.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# lpty +# +################################################################################ + +LPTY_VERSION_UPSTREAM = 1.0.1 +LPTY_VERSION = $(LPTY_VERSION_UPSTREAM)-1 +LPTY_SUBDIR = lpty-$(LPTY_VERSION) +LPTY_LICENSE = MIT +LPTY_LICENSE_FILES = $(LPTY_SUBDIR)/doc/LICENSE + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
PATCH 24/24 lsqlite3: new package
In reply to Francois PerradSigned-off-by Francois Perrad <[email protected]>
--- package/Config.in | 1 + package/lsqlite3/Config.in | 8 ++++++++ package/lsqlite3/lsqlite3.mk | 12 ++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 package/lsqlite3/Config.in create mode 100644 package/lsqlite3/lsqlite3.mk
package/Config.in +1 -0
@@ -375,6 +375,7 @@ source "package/ljsyscall/Config.in" source "package/lpeg/Config.in" source "package/lpty/Config.in" source "package/lrandom/Config.in" +source "package/lsqlite3/Config.in" source "package/lua-cjson/Config.in" source "package/lua-coat/Config.in" source "package/lua-coatpersistent/Config.in"
package/lsqlite3/Config.in new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_PACKAGE_LSQLITE3 + bool "lsqlite3" + select BR2_PACKAGE_SQLITE + depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + help + a thin Lua wrapper for the SQLite3 library. + + http://lua.sqlite.org/
package/lsqlite3/lsqlite3.mk new file +12 -0
@@ -0,0 +1,12 @@ +################################################################################ +# +# lsqlite3 +# +################################################################################ + +LSQLITE3_VERSION = 0.9.1-2 +LSQLITE3_SUBDIR = lsqlite3_fsl09t +LSQLITE3_DEPENDENCIES = sqlite +LSQLITE3_LICENSE = MIT + +$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
cover lua
In reply to Francois PerradDear Francois Perrad,
Quoted 17 lines · Francois Perrad
Francois Perrad (24):
lua: removeLUA_INSTALLED_FILES
lua: refactor install steps
luarocks: never wraps script
luajit: refactor without dont-strip.patch
luajit: refactor without shared-lib.patch
luajit: add host-luajit
luarocks: allow to work with host-luajit
ljlinenoise: new package
lpeg: new package
cosmo: new package
lua-iconv: new package
luajson: new package
lualogging: new package
dado: new package
lrandom: new package
lua-testmore: new package
Quoted 8 lines
lua-coat: new package
lua-coatpersistent: new package
lua-messagepack: new package
lua-csnappy: new package
lzlib: new package
lunit: new package
lpty: new package
lsqlite3: new package
I've started applying a certain number of those patches, but when building some of these Lua packages, I have warning about missing dependencies. For example, when building luajson:
Missing dependency for luajson 1.3.2-1: lunit >= 0.4
Or when building lualogging:
Missing dependency for lualogging 1.3.0-1: luasocket
Are these normal?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
cover lua
2014-03-01 16:09 GMT+01:00 Thomas Petazzoni
<[email protected]>:
Quoted 34 lines
Dear Francois Perrad,
Quoted 17 lines · Francois Perrad
Francois Perrad (24):
lua: removeLUA_INSTALLED_FILES
lua: refactor install steps
luarocks: never wraps script
luajit: refactor without dont-strip.patch
luajit: refactor without shared-lib.patch
luajit: add host-luajit
luarocks: allow to work with host-luajit
ljlinenoise: new package
lpeg: new package
cosmo: new package
lua-iconv: new package
luajson: new package
lualogging: new package
dado: new package
lrandom: new package
lua-testmore: new packageQuoted 8 lines
lua-coat: new package
lua-coatpersistent: new package
lua-messagepack: new package
lua-csnappy: new package
lzlib: new package
lunit: new package
lpty: new package
lsqlite3: new packageI've started applying a certain number of those patches, but when building some of these Lua packages, I have warning about missing dependencies. For example, when building luajson:
Quoted 8 lines
Missing dependency for luajson 1.3.2-1: lunit >= 0.4
Or when building lualogging:
Missing dependency for lualogging 1.3.0-1: luasocket
Are these normal?
Yes.
Our dependencies are handled by Buildroot, Luarocks can handle its own by fetching/building/installing, but we don't want that, so Luarocks is called like this :
$$(LUAROCKS_RUN) make --deps-mode=none
And Luarocks does nothing with dependency except emitting this warning.
Fran?ois
Quoted 11 lines
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
cover lua
Dear Fran?ois Perrad,
Quoted 6 lines · Fran?ois Perrad
Our dependencies are handled by Buildroot, Luarocks can handle its own by fetching/building/installing, but we don't want that, so Luarocks is called like this :
$$(LUAROCKS_RUN) make --deps-mode=noneAnd Luarocks does nothing with dependency except emitting this warning.
Ok, thanks for the clarification. Maybe if --deps-mode=none is passed, luarocks could avoid emitting this warning, in order to reduce the possible confusion for users?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
cover lua
2014-03-01 16:42 GMT+01:00 Thomas Petazzoni
<[email protected]>:
Quoted 9 lines
Dear Fran?ois Perrad,
Quoted 5 lines · Fran?ois Perrad
Our dependencies are handled by Buildroot, Luarocks can handle its own by fetching/building/installing, but we don't want that, so Luarocks is called like this :
$$(LUAROCKS_RUN) make --deps-mode=none
Quoted 6 lines
Quoted 1 line
And Luarocks does nothing with dependency except emitting this warning.
Ok, thanks for the clarification. Maybe if --deps-mode=none is passed, luarocks could avoid emitting this warning, in order to reduce the possible confusion for users?
Fixed for the next release of LuaRock,
see the merged pull request https://github.com/keplerproject/luarocks/pull/236
Fran?ois
Quoted 7 lines
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
cover lua
Dear Fran?ois Perrad,
Quoted 6 lines · Fran?ois Perrad
Quoted 3 lines
Ok, thanks for the clarification. Maybe if --deps-mode=none is passed, luarocks could avoid emitting this warning, in order to reduce the possible confusion for users?
Fixed for the next release of LuaRock,
see the merged pull request https://github.com/keplerproject/luarocks/pull/236
Awesome, thank you!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
cover lua
In reply to Francois PerradDear Francois Perrad,
Quoted 2 lines · Francois Perrad
lpeg: new package
cosmo: new package
These two applied.
Quoted 5 lines
luajson: new package
lualogging: new package
dado: new package
lrandom: new package
lua-testmore: new package
Quoted 8 lines
lua-coat: new package
lua-coatpersistent: new package
lua-messagepack: new package
lua-csnappy: new package
lzlib: new package
lunit: new package
lpty: new package
lsqlite3: new package
All these applied.
If I'm correct the patches that remain to be applied are:
[11/24] lua-iconv: new package
This one has questions from Arnout.
[08/24] ljlinenoise: new package
Small comments from Arnout.
[07/24] luarocks: allow to work with host-luajit
Comments from Arnout.
[06/24] luajit: add host-luajit
Ditto.
[05/24] luajit: refactor without shared-lib.patch
Some comments from Samuel, apparently you wanted to add another static linking related patch to the series.
[04/24] luajit: refactor without dont-strip.patch
Comments from Arnout.
Would you mind resending another series with those patches, taking into account the comments?
Also, may I insist yet another time on the fact that your commit logs are very often way too short. For anything that isn't a simple package addition or bump, a good rule of thumb is that your commit log must have at least 2 or 3 paragraphs detailing what's going on. If you don't have 2 or 3 paragraphs for each of your commit logs, please re-read them again and ask yourself whether the patch can easily be understood by reviewers. If not, your commit log should be improved.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com