[Buildroot] [PATCH 00/24] lua

[Buildroot] [PATCH 00/24] lua

[Francois Perrad]

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

-- 
1.7.9.5

[Buildroot] [PATCH 01/24] lua: remove LUA_INSTALLED_FILES

[Francois Perrad]

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 <francois.perrad@gadz.org>
---
 package/lua/lua.mk |   11 -----------
 1 file changed, 11 deletions(-)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 2c867f6..a20531c 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 02/24] lua: refactor install steps

[Francois Perrad]

since the commit (lua*: restore version in module paths),
the upstream Makefiles are usable for install.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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(-)

diff --git a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
index 97a7068..1227cbd 100644
--- a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
+++ b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
@@ -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 <francois.perrad@gadz.org>
 
+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
diff --git a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
index 4679325..9321c62 100644
--- a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
+++ b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
@@ -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 <francois.perrad@gadz.org>
 
+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
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index a20531c..c016d7e 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 03/24] luarocks: never wraps script

[Francois Perrad]

this config prevents the introduction of some HOST_DIR paths on target

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/luarocks/luarocks.mk |    1 +
 1 file changed, 1 insertion(+)

diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
index 88ab22a..86e57d2 100644
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 04/24] luajit: refactor without dont-strip.patch

[Francois Perrad]

the variable TARGET_STRIP does the job

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/luajit/luajit-03-dont-strip.patch b/package/luajit/luajit-03-dont-strip.patch
deleted file mode 100644
index 66bdadf..0000000
--- a/package/luajit/luajit-03-dont-strip.patch
+++ /dev/null
@@ -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 <thomas.petazzoni@free-electrons.com>
-
-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"
- 
- ##############################################################################
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 529d3c2..186b3fd 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -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)" \
-- 
1.7.9.5

[Buildroot] [PATCH 05/24] luajit: refactor without shared-lib.patch

[Francois Perrad]

the variable BUILDMODE does the job

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/luajit/luajit-02-shared-lib.patch b/package/luajit/luajit-02-shared-lib.patch
deleted file mode 100644
index 361e5c2..0000000
--- a/package/luajit/luajit-02-shared-lib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Compile the luajit binary dynamically against the luajit library
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-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"
- 
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 186b3fd..01fbb78 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -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
 
-- 
1.7.9.5

[Buildroot] [PATCH 06/24] luajit: add host-luajit

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/luajit/luajit.mk |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 01fbb78..f742333 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 07/24] luarocks: allow to work with host-luajit

[Francois Perrad]

when we use luajit on target

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/luainterpreter/luainterpreter.mk |    4 ++++
 package/luarocks/luarocks.mk             |   18 ++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/package/luainterpreter/luainterpreter.mk b/package/luainterpreter/luainterpreter.mk
index c37d621..d5b95db 100644
--- a/package/luainterpreter/luainterpreter.mk
+++ b/package/luainterpreter/luainterpreter.mk
@@ -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))
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
index 86e57d2..0b99de6 100644
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -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
-- 
1.7.9.5

[Buildroot] [PATCH 08/24] ljlinenoise: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index fca61d6..edff553 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/ljlinenoise/Config.in b/package/ljlinenoise/Config.in
new file mode 100644
index 0000000..3d2af35
--- /dev/null
+++ b/package/ljlinenoise/Config.in
@@ -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)
diff --git a/package/ljlinenoise/ljlinenoise.mk b/package/ljlinenoise/ljlinenoise.mk
new file mode 100644
index 0000000..69f6130
--- /dev/null
+++ b/package/ljlinenoise/ljlinenoise.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 09/24] lpeg: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index edff553..a7df716 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lpeg/Config.in b/package/lpeg/Config.in
new file mode 100644
index 0000000..da54d61
--- /dev/null
+++ b/package/lpeg/Config.in
@@ -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
diff --git a/package/lpeg/lpeg.mk b/package/lpeg/lpeg.mk
new file mode 100644
index 0000000..a9759e5
--- /dev/null
+++ b/package/lpeg/lpeg.mk
@@ -0,0 +1,10 @@
+################################################################################
+#
+# lpeg
+#
+################################################################################
+
+LPEG_VERSION = 0.12-1
+LPEG_LICENSE = MIT
+
+$(eval $(luarocks-package))
-- 
1.7.9.5

[Buildroot] [PATCH 10/24] cosmo: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index a7df716..29a0245 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/cosmo/Config.in b/package/cosmo/Config.in
new file mode 100644
index 0000000..1b5b622
--- /dev/null
+++ b/package/cosmo/Config.in
@@ -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/
diff --git a/package/cosmo/cosmo.mk b/package/cosmo/cosmo.mk
new file mode 100644
index 0000000..2592f62
--- /dev/null
+++ b/package/cosmo/cosmo.mk
@@ -0,0 +1,10 @@
+################################################################################
+#
+# cosmo
+#
+################################################################################
+
+COSMO_VERSION = 13.01.30-1
+COSMO_LICENSE = MIT
+
+$(eval $(luarocks-package))
-- 
1.7.9.5

[Buildroot] [PATCH 11/24] lua-iconv: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index 29a0245..5f3ef17 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lua-iconv/Config.in b/package/lua-iconv/Config.in
new file mode 100644
index 0000000..2d9248c
--- /dev/null
+++ b/package/lua-iconv/Config.in
@@ -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/
diff --git a/package/lua-iconv/lua-iconv.mk b/package/lua-iconv/lua-iconv.mk
new file mode 100644
index 0000000..edb901e
--- /dev/null
+++ b/package/lua-iconv/lua-iconv.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 12/24] luajson: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index 5f3ef17..e65d71d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/luajson/Config.in b/package/luajson/Config.in
new file mode 100644
index 0000000..9be7d25
--- /dev/null
+++ b/package/luajson/Config.in
@@ -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
diff --git a/package/luajson/luajson.mk b/package/luajson/luajson.mk
new file mode 100644
index 0000000..88db6b0
--- /dev/null
+++ b/package/luajson/luajson.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 13/24] lualogging: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index e65d71d..0a1e891 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lualogging/Config.in b/package/lualogging/Config.in
new file mode 100644
index 0000000..37d7015
--- /dev/null
+++ b/package/lualogging/Config.in
@@ -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/
diff --git a/package/lualogging/lualogging.mk b/package/lualogging/lualogging.mk
new file mode 100644
index 0000000..91007f2
--- /dev/null
+++ b/package/lualogging/lualogging.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 14/24] dado: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index 0a1e891..f9124d7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/dado/Config.in b/package/dado/Config.in
new file mode 100644
index 0000000..fb469f4
--- /dev/null
+++ b/package/dado/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_DADO
+	bool "dado"
+	help
+	  Database Facilities for LuaSQL.
+
+	  http://www.ccpa.puc-rio.br/software/dado/
diff --git a/package/dado/dado.mk b/package/dado/dado.mk
new file mode 100644
index 0000000..3a58215
--- /dev/null
+++ b/package/dado/dado.mk
@@ -0,0 +1,10 @@
+################################################################################
+#
+# dado
+#
+################################################################################
+
+DADO_VERSION = 1.5.2-1
+DADO_LICENSE = MIT
+
+$(eval $(luarocks-package))
-- 
1.7.9.5

[Buildroot] [PATCH 15/24] lrandom: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index f9124d7..32fd6f6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lrandom/Config.in b/package/lrandom/Config.in
new file mode 100644
index 0000000..661707d
--- /dev/null
+++ b/package/lrandom/Config.in
@@ -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
diff --git a/package/lrandom/lrandom.mk b/package/lrandom/lrandom.mk
new file mode 100644
index 0000000..0035791
--- /dev/null
+++ b/package/lrandom/lrandom.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 16/24] lua-testmore: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index 32fd6f6..7b6ace6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lua-testmore/Config.in b/package/lua-testmore/Config.in
new file mode 100644
index 0000000..61dea3a
--- /dev/null
+++ b/package/lua-testmore/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LUA_TESTMORE
+	bool "lua-testmore"
+	help
+	  an Unit Testing Framework.
+
+	  http://fperrad.github.io/lua-TestMore/
diff --git a/package/lua-testmore/lua-testmore.mk b/package/lua-testmore/lua-testmore.mk
new file mode 100644
index 0000000..fcbb170
--- /dev/null
+++ b/package/lua-testmore/lua-testmore.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 17/24] lua-coat: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index 7b6ace6..c494d64 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lua-coat/Config.in b/package/lua-coat/Config.in
new file mode 100644
index 0000000..f6ba6cf
--- /dev/null
+++ b/package/lua-coat/Config.in
@@ -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/
diff --git a/package/lua-coat/lua-coat.mk b/package/lua-coat/lua-coat.mk
new file mode 100644
index 0000000..a9d9143
--- /dev/null
+++ b/package/lua-coat/lua-coat.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 18/24] lua-coatpersistent: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index c494d64..3ed5f34 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lua-coatpersistent/Config.in b/package/lua-coatpersistent/Config.in
new file mode 100644
index 0000000..581f927
--- /dev/null
+++ b/package/lua-coatpersistent/Config.in
@@ -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/
diff --git a/package/lua-coatpersistent/lua-coatpersistent.mk b/package/lua-coatpersistent/lua-coatpersistent.mk
new file mode 100644
index 0000000..3dc9861
--- /dev/null
+++ b/package/lua-coatpersistent/lua-coatpersistent.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 19/24] lua-messagepack: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index 3ed5f34..4e32d25 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lua-messagepack/Config.in b/package/lua-messagepack/Config.in
new file mode 100644
index 0000000..f44fa3b
--- /dev/null
+++ b/package/lua-messagepack/Config.in
@@ -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/
+
diff --git a/package/lua-messagepack/lua-messagepack.mk b/package/lua-messagepack/lua-messagepack.mk
new file mode 100644
index 0000000..9a680ee
--- /dev/null
+++ b/package/lua-messagepack/lua-messagepack.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 20/24] lua-csnappy: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index 4e32d25..9c34e58 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lua-csnappy/Config.in b/package/lua-csnappy/Config.in
new file mode 100644
index 0000000..0562277
--- /dev/null
+++ b/package/lua-csnappy/Config.in
@@ -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/
+
diff --git a/package/lua-csnappy/lua-csnappy.mk b/package/lua-csnappy/lua-csnappy.mk
new file mode 100644
index 0000000..07aaf77
--- /dev/null
+++ b/package/lua-csnappy/lua-csnappy.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 21/24] lzlib: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index 9c34e58..fa3c729 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lzlib/Config.in b/package/lzlib/Config.in
new file mode 100644
index 0000000..fc94342
--- /dev/null
+++ b/package/lzlib/Config.in
@@ -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/
diff --git a/package/lzlib/lzlib.mk b/package/lzlib/lzlib.mk
new file mode 100644
index 0000000..24208ba
--- /dev/null
+++ b/package/lzlib/lzlib.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 22/24] lunit: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index fa3c729..7cb32be 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lunit/Config.in b/package/lunit/Config.in
new file mode 100644
index 0000000..b3620ef
--- /dev/null
+++ b/package/lunit/Config.in
@@ -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
diff --git a/package/lunit/lunit.mk b/package/lunit/lunit.mk
new file mode 100644
index 0000000..1b5f43c
--- /dev/null
+++ b/package/lunit/lunit.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 23/24] lpty: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index 7cb32be..2bc3cc9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lpty/Config.in b/package/lpty/Config.in
new file mode 100644
index 0000000..0cd6850
--- /dev/null
+++ b/package/lpty/Config.in
@@ -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/
diff --git a/package/lpty/lpty.mk b/package/lpty/lpty.mk
new file mode 100644
index 0000000..0c3b7f9
--- /dev/null
+++ b/package/lpty/lpty.mk
@@ -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))
-- 
1.7.9.5

[Buildroot] [PATCH 24/24] lsqlite3: new package

[Francois Perrad]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 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

diff --git a/package/Config.in b/package/Config.in
index 2bc3cc9..3ea8b08 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/lsqlite3/Config.in b/package/lsqlite3/Config.in
new file mode 100644
index 0000000..e19c789
--- /dev/null
+++ b/package/lsqlite3/Config.in
@@ -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/
diff --git a/package/lsqlite3/lsqlite3.mk b/package/lsqlite3/lsqlite3.mk
new file mode 100644
index 0000000..f02aa4c
--- /dev/null
+++ b/package/lsqlite3/lsqlite3.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# lsqlite3
+#
+################################################################################
+
+LSQLITE3_VERSION = 0.9.1-2
+LSQLITE3_SUBDIR  = lsqlite3_fsl09t
+LSQLITE3_DEPENDENCIES = sqlite
+LSQLITE3_LICENSE = MIT
+
+$(eval $(luarocks-package))
-- 
1.7.9.5

[Buildroot] [PATCH 01/24] lua: remove LUA_INSTALLED_FILES

[Arnout Vandecappelle]

On 24/02/14 08:34, Francois Perrad wrote:
> 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

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

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


> ---
>  package/lua/lua.mk |   11 -----------
>  1 file changed, 11 deletions(-)
> 
> diff --git a/package/lua/lua.mk b/package/lua/lua.mk
> index 2c867f6..a20531c 100644
> --- a/package/lua/lua.mk
> +++ b/package/lua/lua.mk
> @@ -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))
> 


-- 
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] [PATCH 02/24] lua: refactor install steps

[Arnout Vandecappelle]

On 24/02/14 08:34, Francois Perrad wrote:
> since the commit (lua*: restore version in module paths),

 If you refer to a commit, please use its abbreviated sha.

> the upstream Makefiles are usable for install.
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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(-)
> 
> diff --git a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
> index 97a7068..1227cbd 100644
> --- a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
> +++ b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
> @@ -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 <francois.perrad@gadz.org>
>  
> +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.

> + 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?

> ++	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

> + 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
> + 
> + ranlib:
>  Index: b/src/Makefile
>  ===================================================================
>  --- a/src/Makefile
> diff --git a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
> index 4679325..9321c62 100644
> --- a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
> +++ b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
> @@ -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 <francois.perrad@gadz.org>
>  
> +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
> diff --git a/package/lua/lua.mk b/package/lua/lua.mk
> index a20531c..c016d7e 100644
> --- a/package/lua/lua.mk
> +++ b/package/lua/lua.mk
> @@ -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))
> 


-- 
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] [PATCH 02/24] lua: refactor install steps

[Arnout Vandecappelle]

On 25/02/14 18:39, Arnout Vandecappelle wrote:
>  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?

 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 cast
loadlib.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

-- 
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] [PATCH 02/24] lua: refactor install steps

[François Perrad]

2014-02-25 18:39 GMT+01:00 Arnout Vandecappelle <arnout@mind.be>:
> On 24/02/14 08:34, Francois Perrad wrote:
>> since the commit (lua*: restore version in module paths),
>
>  If you refer to a commit, please use its abbreviated sha.
>
>> the upstream Makefiles are usable for install.
>>
>> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>> ---
>>  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(-)
>>
>> diff --git a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
>> index 97a7068..1227cbd 100644
>> --- a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
>> +++ b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
>> @@ -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 <francois.perrad@gadz.org>
>>
>> +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.

>
>> + 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?

Ok.

>
>> ++    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

Ok.

>
>
>
>  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?

You are right. lua doesn't work with Blackfin.
See http://patchwork.ozlabs.org/patch/314146/

Fran?ois.

>
>
>  Regards,
>  Arnout
>
>> +     cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
>> +
>> + ranlib:
>>  Index: b/src/Makefile
>>  ===================================================================
>>  --- a/src/Makefile
>> diff --git a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
>> index 4679325..9321c62 100644
>> --- a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
>> +++ b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
>> @@ -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 <francois.perrad@gadz.org>
>>
>> +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
>> diff --git a/package/lua/lua.mk b/package/lua/lua.mk
>> index a20531c..c016d7e 100644
>> --- a/package/lua/lua.mk
>> +++ b/package/lua/lua.mk
>> @@ -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))
>>
>
>
> --
> 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

[Buildroot] [PATCH 02/24] lua: refactor install steps

[Arnout Vandecappelle]

On 25/02/14 22:07, Fran?ois Perrad wrote:
>> >
>> >  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?
> 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

-- 
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] [PATCH 04/24] luajit: refactor without dont-strip.patch

[Arnout Vandecappelle]

On 02/24/14 08:34, Francois Perrad wrote:
> the variable TARGET_STRIP does the job
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
> 
> diff --git a/package/luajit/luajit-03-dont-strip.patch b/package/luajit/luajit-03-dont-strip.patch
> deleted file mode 100644
> index 66bdadf..0000000
> --- a/package/luajit/luajit-03-dont-strip.patch
> +++ /dev/null
> @@ -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 <thomas.petazzoni@free-electrons.com>
> -
> -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"
> - 
> - ##############################################################################
> diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
> index 529d3c2..186b3fd 100644
> --- a/package/luajit/luajit.mk
> +++ b/package/luajit/luajit.mk
> @@ -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 sets
TARGET_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
>  		TARGET_CFLAGS="$(TARGET_CFLAGS)" \
>  		TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
>  		HOST_CC="$(LUAJIT_HOST_CC)" \
> 


-- 
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] [PATCH 05/24] luajit: refactor without shared-lib.patch

[Arnout Vandecappelle]

On 02/24/14 08:34, Francois Perrad wrote:
> the variable BUILDMODE does the job
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

> ---
>  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
> 
> diff --git a/package/luajit/luajit-02-shared-lib.patch b/package/luajit/luajit-02-shared-lib.patch
> deleted file mode 100644
> index 361e5c2..0000000
> --- a/package/luajit/luajit-02-shared-lib.patch
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -Compile the luajit binary dynamically against the luajit library
> -
> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> -
> -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"
> - 
> diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
> index 186b3fd..01fbb78 100644
> --- a/package/luajit/luajit.mk
> +++ b/package/luajit/luajit.mk
> @@ -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
>  
> 


-- 
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] [PATCH 06/24] luajit: add host-luajit

[Arnout Vandecappelle]

On 02/24/14 08:34, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

 You should indicate why host-luajit is needed.

 Regards,
 Arnout

> ---
>  package/luajit/luajit.mk |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
> index 01fbb78..f742333 100644
> --- a/package/luajit/luajit.mk
> +++ b/package/luajit/luajit.mk
> @@ -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))
> 


-- 
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] [PATCH 07/24] luarocks: allow to work with host-luajit

[Arnout Vandecappelle]

On 02/24/14 08:34, Francois Perrad wrote:
> 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 :-)

> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/luainterpreter/luainterpreter.mk |    4 ++++
>  package/luarocks/luarocks.mk             |   18 ++++++++++++------
>  2 files changed, 16 insertions(+), 6 deletions(-)
> 
> diff --git a/package/luainterpreter/luainterpreter.mk b/package/luainterpreter/luainterpreter.mk
> index c37d621..d5b95db 100644
> --- a/package/luainterpreter/luainterpreter.mk
> +++ b/package/luainterpreter/luainterpreter.mk
> @@ -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.

> +
> +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...

> diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
> index 86e57d2..0b99de6 100644
> --- a/package/luarocks/luarocks.mk
> +++ b/package/luarocks/luarocks.mk
> @@ -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

 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

> 


-- 
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] [PATCH 08/24] ljlinenoise: new package

[Arnout Vandecappelle]

On 02/24/14 08:34, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
> 
> diff --git a/package/Config.in b/package/Config.in
> index fca61d6..edff553 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -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"
> diff --git a/package/ljlinenoise/Config.in b/package/ljlinenoise/Config.in
> new file mode 100644
> index 0000000..3d2af35
> --- /dev/null
> +++ b/package/ljlinenoise/Config.in
> @@ -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)

 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

> diff --git a/package/ljlinenoise/ljlinenoise.mk b/package/ljlinenoise/ljlinenoise.mk
> new file mode 100644
> index 0000000..69f6130
> --- /dev/null
> +++ b/package/ljlinenoise/ljlinenoise.mk
> @@ -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))
> 


-- 
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] [PATCH 09/24] lpeg: new package

[Arnout Vandecappelle]

On 02/24/14 08:34, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 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

> ---
>  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
> 
> diff --git a/package/Config.in b/package/Config.in
> index edff553..a7df716 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -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"
> diff --git a/package/lpeg/Config.in b/package/lpeg/Config.in
> new file mode 100644
> index 0000000..da54d61
> --- /dev/null
> +++ b/package/lpeg/Config.in
> @@ -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
> diff --git a/package/lpeg/lpeg.mk b/package/lpeg/lpeg.mk
> new file mode 100644
> index 0000000..a9759e5
> --- /dev/null
> +++ b/package/lpeg/lpeg.mk
> @@ -0,0 +1,10 @@
> +################################################################################
> +#
> +# lpeg
> +#
> +################################################################################
> +
> +LPEG_VERSION = 0.12-1
> +LPEG_LICENSE = MIT
> +
> +$(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] [PATCH 10/24] cosmo: new package

[Arnout Vandecappelle]

On 02/24/14 08:34, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
> 
> diff --git a/package/Config.in b/package/Config.in
> index a7df716..29a0245 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -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"
> diff --git a/package/cosmo/Config.in b/package/cosmo/Config.in
> new file mode 100644
> index 0000000..1b5b622
> --- /dev/null
> +++ b/package/cosmo/Config.in
> @@ -0,0 +1,7 @@
> +config BR2_PACKAGE_COSMO
> +	bool "cosmo"
> +	select BR2_PACKAGE_LPEG

 Mention "run-time dependency only"

 Regards,
 Arnout

> +	help
> +	  Cosmo is a "safe templates" engine for Lua.
> +
> +	  http://mascarenhas.github.io/cosmo/
> diff --git a/package/cosmo/cosmo.mk b/package/cosmo/cosmo.mk
> new file mode 100644
> index 0000000..2592f62
> --- /dev/null
> +++ b/package/cosmo/cosmo.mk
> @@ -0,0 +1,10 @@
> +################################################################################
> +#
> +# cosmo
> +#
> +################################################################################
> +
> +COSMO_VERSION = 13.01.30-1
> +COSMO_LICENSE = MIT
> +
> +$(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] [PATCH 11/24] lua-iconv: new package

[Arnout Vandecappelle]

On 02/24/14 08:34, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
> 
> diff --git a/package/Config.in b/package/Config.in
> index 29a0245..5f3ef17 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -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"
> diff --git a/package/lua-iconv/Config.in b/package/lua-iconv/Config.in
> new file mode 100644
> index 0000000..2d9248c
> --- /dev/null
> +++ b/package/lua-iconv/Config.in
> @@ -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

> +	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)?


> +	help
> +	  Lua binding to the POSIX 'iconv' library
> +
> +	  http://ittner.github.io/lua-iconv/
> diff --git a/package/lua-iconv/lua-iconv.mk b/package/lua-iconv/lua-iconv.mk
> new file mode 100644
> index 0000000..edb901e
> --- /dev/null
> +++ b/package/lua-iconv/lua-iconv.mk
> @@ -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

 Doesn't it have a compile-time dependency on iconv at all? I.e.:

LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)



 Regards,
 Arnout

> +
> +$(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] [PATCH 12/24] luajson: new package

[Arnout Vandecappelle]

On 02/24/14 08:34, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
> 
> diff --git a/package/Config.in b/package/Config.in
> index 5f3ef17..e65d71d 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -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"
> diff --git a/package/luajson/Config.in b/package/luajson/Config.in
> new file mode 100644
> index 0000000..9be7d25
> --- /dev/null
> +++ b/package/luajson/Config.in
> @@ -0,0 +1,8 @@
> +config BR2_PACKAGE_LUAJSON
> +	bool "luajson"
> +	select BR2_PACKAGE_LPEG

 # run-time dependency only

> +	help
> +	  LuaJSON is a customizable JSON decoder/encoder
> +	  using LPEG for parsing.
> +
> +	  http://github.com/harningt/luajson
> diff --git a/package/luajson/luajson.mk b/package/luajson/luajson.mk
> new file mode 100644
> index 0000000..88db6b0
> --- /dev/null
> +++ b/package/luajson/luajson.mk
> @@ -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

> +LUAJSON_LICENSE = MIT
> +LUAJSON_LICENSE_FILES = $(LUAJSON_SUBDIR)/LICENSE
> +
> +$(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] [PATCH 05/24] luajit: refactor without shared-lib.patch

[Samuel Martin]

Hi Francois,

On Mon, Feb 24, 2014 at 8:34 AM, Francois Perrad <fperrad@gmail.com> wrote:
> the variable BUILDMODE does the job
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
>
> diff --git a/package/luajit/luajit-02-shared-lib.patch b/package/luajit/luajit-02-shared-lib.patch
> deleted file mode 100644
> index 361e5c2..0000000
> --- a/package/luajit/luajit-02-shared-lib.patch
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -Compile the luajit binary dynamically against the luajit library
> -
> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> -
> -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"
> -
> diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
> index 186b3fd..01fbb78 100644
> --- a/package/luajit/luajit.mk
> +++ b/package/luajit/luajit.mk
> @@ -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,


-- 
Samuel

[Buildroot] [PATCH 05/24] luajit: refactor without shared-lib.patch

[François Perrad]

2014-02-27 10:05 GMT+01:00 Samuel Martin <s.martin49@gmail.com>:
> Hi Francois,
>
> On Mon, Feb 24, 2014 at 8:34 AM, Francois Perrad <fperrad@gmail.com> wrote:
>> the variable BUILDMODE does the job
>>
>> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>> ---
>>  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
>>
>> diff --git a/package/luajit/luajit-02-shared-lib.patch b/package/luajit/luajit-02-shared-lib.patch
>> deleted file mode 100644
>> index 361e5c2..0000000
>> --- a/package/luajit/luajit-02-shared-lib.patch
>> +++ /dev/null
>> @@ -1,17 +0,0 @@
>> -Compile the luajit binary dynamically against the luajit library
>> -
>> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>> -
>> -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"
>> -
>> diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
>> index 186b3fd..01fbb78 100644
>> --- a/package/luajit/luajit.mk
>> +++ b/package/luajit/luajit.mk
>> @@ -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

> Regards,
>
>
> --
> Samuel
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 09/24] lpeg: new package

[Thomas Petazzoni]

Dear Francois Perrad,

On Mon, 24 Feb 2014 08:34:45 +0100, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 10/24] cosmo: new package

[Thomas Petazzoni]

Dear Francois Perrad,

On Mon, 24 Feb 2014 08:34:46 +0100, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 12/24] luajson: new package

[Thomas Petazzoni]

Dear Francois Perrad,

On Mon, 24 Feb 2014 08:34:48 +0100, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 00/24] lua

[Thomas Petazzoni]

Dear Francois Perrad,

On Mon, 24 Feb 2014 08:34:36 +0100, Francois Perrad wrote:

> 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

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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 13/24] lualogging: new package

[Thomas Petazzoni]

Dear Francois Perrad,

On Mon, 24 Feb 2014 08:34:49 +0100, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 14/24] dado: new package

[Thomas Petazzoni]

Dear Francois Perrad,

On Mon, 24 Feb 2014 08:34:50 +0100, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 15/24] lrandom: new package

[Thomas Petazzoni]

Dear Francois Perrad,

On Mon, 24 Feb 2014 08:34:51 +0100, Francois Perrad wrote:
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 00/24] lua

[François Perrad]

2014-03-01 16:09 GMT+01:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Dear Francois Perrad,
>
> On Mon, 24 Feb 2014 08:34:36 +0100, Francois Perrad wrote:
>
>> 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
>
> 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?
>

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

> 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

[Buildroot] [PATCH 00/24] lua

[Thomas Petazzoni]

Dear Fran?ois Perrad,

On Sat, 1 Mar 2014 16:34:35 +0100, Fran?ois Perrad wrote:

> 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.

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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 11/24] lua-iconv: new package

[François Perrad]

2014-02-27 8:16 GMT+01:00 Arnout Vandecappelle <arnout@mind.be>:
> On 02/24/14 08:34, Francois Perrad wrote:
>>
>> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>> ---
>>  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
>>
>> diff --git a/package/Config.in b/package/Config.in
>> index 29a0245..5f3ef17 100644
>> --- a/package/Config.in
>> +++ b/package/Config.in
>> @@ -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"
>> diff --git a/package/lua-iconv/Config.in b/package/lua-iconv/Config.in
>> new file mode 100644
>> index 0000000..2d9248c
>> --- /dev/null
>> +++ b/package/lua-iconv/Config.in
>> @@ -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

I don't think,
lua-iconv is binding of iconv, so iconv is not an optional dependency

>
>> +     depends on BR2_PACKAGE_HAS_LUA_INTERPRETER
>
>  We 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).

>
>
>> +     help
>> +       Lua binding to the POSIX 'iconv' library
>> +
>> +       http://ittner.github.io/lua-iconv/
>> diff --git a/package/lua-iconv/lua-iconv.mk b/package/lua-iconv/lua-iconv.mk
>> new file mode 100644
>> index 0000000..edb901e
>> --- /dev/null
>> +++ b/package/lua-iconv/lua-iconv.mk
>> @@ -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
>
>  Doesn't it have a compile-time dependency on iconv at all? I.e.:
>
> LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
>

LUA_ICONV_DEPENDENCIES = luainterpreter libiconv

Fran?ois

>
>
>  Regards,
>  Arnout
>
>> +
>> +$(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

[Buildroot] [PATCH 00/24] lua

[Thomas Petazzoni]

Dear Francois Perrad,

On Mon, 24 Feb 2014 08:34:36 +0100, Francois Perrad wrote:

>   lpeg: new package
>   cosmo: new package

These two applied.

>   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

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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 00/24] lua

[François Perrad]

2014-03-01 16:42 GMT+01:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Dear Fran?ois Perrad,
>
> On Sat, 1 Mar 2014 16:34:35 +0100, Fran?ois Perrad wrote:
>
>> 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.
>
> 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

> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com

[Buildroot] [PATCH 00/24] lua

[Thomas Petazzoni]

Dear Fran?ois Perrad,

On Sun, 2 Mar 2014 08:57:01 +0100, Fran?ois Perrad wrote:

> > 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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com