All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2
@ 2012-09-04  6:58 Francois Perrad
  2012-09-04  6:58 ` [Buildroot] [PATCH 2/5] luajit: complete replacement for lua v2 Francois Perrad
                   ` (4 more replies)
  0 siblings, 5 replies; 11+ messages in thread
From: Francois Perrad @ 2012-09-04  6:58 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Wojciech M. Zabolotny <wzab01@gmail.com>
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/Config.in                                |    1 +
 package/lua-msgpack-native/Config.in             |    7 ++++++
 package/lua-msgpack-native/lua-msgpack-native.mk |   29 ++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/lua-msgpack-native/Config.in
 create mode 100644 package/lua-msgpack-native/lua-msgpack-native.mk

diff --git a/package/Config.in b/package/Config.in
index f308de7..f05f5f4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -257,6 +257,7 @@ source "package/luacjson/Config.in"
 source "package/luaexpat/Config.in"
 source "package/luafilesystem/Config.in"
 source "package/luasocket/Config.in"
+source "package/lua-msgpack-native/Config.in"
 source "package/rings/Config.in"
 source "package/wsapi/Config.in"
 source "package/xavante/Config.in"
diff --git a/package/lua-msgpack-native/Config.in b/package/lua-msgpack-native/Config.in
new file mode 100644
index 0000000..90eecc3
--- /dev/null
+++ b/package/lua-msgpack-native/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_MSGPACK_NATIVE
+	bool "lua-msgpack-native"
+	help
+	  This is a native, C language implementation of msgpack (http://msgpack.org)
+	  library/protocol for Lua language
+
+	  https://github.com/kengonakajima/lua-msgpack-native
diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk
new file mode 100644
index 0000000..5d8cd2d
--- /dev/null
+++ b/package/lua-msgpack-native/lua-msgpack-native.mk
@@ -0,0 +1,29 @@
+#############################################################
+#
+# lua-msgpack-native
+#
+#############################################################
+LUA_MSGPACK_NATIVE_VERSION = 41cce91ab6
+LUA_MSGPACK_NATIVE_SITE = git://github.com/kengonakajima/lua-msgpack-native.git
+LUA_MSGPACK_NATIVE_METHOD = git
+LUA_MSGPACK_NATIVE_DEPENDENCIES = lua
+LUA_MSGPACK_NATIVE_LICENSE = Apache-2.0
+LUA_MSGPACK_NATIVE_LICENSE_FILES = LICENSE.txt
+
+define LUA_MSGPACK_NATIVE_BUILD_CMDS
+	$(TARGET_CC) $(TARGET_CFLAGS) -fPIC -shared -o $(@D)/msgpack.so $(@D)/mp.c
+endef
+
+define LUA_MSGPACK_NATIVE_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -D $(@D)/msgpack.so $(TARGET_DIR)/usr/lib/lua/msgpack.so
+endef
+
+define LUA_MSGPACK_NATIVE_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/lib/lua/msgpack.so
+endef
+
+define LUA_MSGPACK_NATIVE_CLEAN_CMDS
+	rm -f $(@D)/msgpack.so
+endef
+
+$(eval $(generic-package))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/5] luajit: complete replacement for lua v2
  2012-09-04  6:58 [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2 Francois Perrad
@ 2012-09-04  6:58 ` Francois Perrad
  2012-09-04  6:58 ` [Buildroot] [PATCH 3/5] luajit: allow building for the host Francois Perrad
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 11+ messages in thread
From: Francois Perrad @ 2012-09-04  6:58 UTC (permalink / raw)
  To: buildroot

the mutual exclusion is done by a choice

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 Makefile                                         |    6 ++++++
 package/Config.in                                |    1 -
 package/copas/copas.mk                           |    2 +-
 package/coxpcall/coxpcall.mk                     |    1 -
 package/lua-msgpack-native/lua-msgpack-native.mk |    2 +-
 package/lua/Config.in                            |   25 ++++++++++++++++++++++
 package/luacjson/luacjson.mk                     |    2 +-
 package/luaexpat/luaexpat.mk                     |    2 +-
 package/luafilesystem/luafilesystem.mk           |    2 +-
 package/luajit/Config.in                         |   12 -----------
 package/luajit/luajit-05-install-like-lua.patch  |   17 +++++++++++++++
 package/luasocket/luasocket.mk                   |    2 +-
 package/rings/rings.mk                           |    2 +-
 package/xavante/xavante.mk                       |    2 +-
 14 files changed, 56 insertions(+), 22 deletions(-)
 delete mode 100644 package/luajit/Config.in
 create mode 100644 package/luajit/luajit-05-install-like-lua.patch

diff --git a/Makefile b/Makefile
index d59a548..0b7e2bf 100644
--- a/Makefile
+++ b/Makefile
@@ -284,6 +284,12 @@ HOSTCC  := $(CCACHE) $(HOSTCC)
 HOSTCXX := $(CCACHE) $(HOSTCXX)
 endif
 
+ifeq ($(BR2_PACKAGE_LUA),y)
+    LUA_INTERPRETER = lua
+else ifeq ($(BR2_PACKAGE_LUAJIT),y)
+    LUA_INTERPRETER = luajit
+endif
+
 #############################################################
 #
 # You should probably leave this stuff alone unless you know
diff --git a/package/Config.in b/package/Config.in
index f05f5f4..a128bf5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -247,7 +247,6 @@ endmenu
 menu "Interpreter languages and scripting"
 source "package/haserl/Config.in"
 source "package/lua/Config.in"
-source "package/luajit/Config.in"
 if BR2_PACKAGE_LUA || BR2_PACKAGE_LUAJIT
 menu "LUA libraries/modules"
 source "package/cgilua/Config.in"
diff --git a/package/copas/copas.mk b/package/copas/copas.mk
index c84a6cc..a258927 100644
--- a/package/copas/copas.mk
+++ b/package/copas/copas.mk
@@ -6,7 +6,7 @@
 
 COPAS_VERSION = 1.1.6
 COPAS_SITE = http://github.com/downloads/keplerproject/copas
-COPAS_DEPENDENCIES = lua coxpcall luasocket
+COPAS_DEPENDENCIES = coxpcall luasocket
 COPAS_LICENSE = MIT
 
 define COPAS_INSTALL_TARGET_CMDS
diff --git a/package/coxpcall/coxpcall.mk b/package/coxpcall/coxpcall.mk
index e7fb76d..329d6fd 100644
--- a/package/coxpcall/coxpcall.mk
+++ b/package/coxpcall/coxpcall.mk
@@ -6,7 +6,6 @@
 
 COXPCALL_VERSION = 1.13.0
 COXPCALL_SITE = http://luaforge.net/frs/download.php/3406
-COXPCALL_DEPENDENCIES = lua
 COXPCALL_LICENSE = MIT
 
 define COXPCALL_INSTALL_TARGET_CMDS
diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk
index 5d8cd2d..b37e194 100644
--- a/package/lua-msgpack-native/lua-msgpack-native.mk
+++ b/package/lua-msgpack-native/lua-msgpack-native.mk
@@ -6,7 +6,7 @@
 LUA_MSGPACK_NATIVE_VERSION = 41cce91ab6
 LUA_MSGPACK_NATIVE_SITE = git://github.com/kengonakajima/lua-msgpack-native.git
 LUA_MSGPACK_NATIVE_METHOD = git
-LUA_MSGPACK_NATIVE_DEPENDENCIES = lua
+LUA_MSGPACK_NATIVE_DEPENDENCIES = $(LUA_INTERPRETER)
 LUA_MSGPACK_NATIVE_LICENSE = Apache-2.0
 LUA_MSGPACK_NATIVE_LICENSE_FILES = LICENSE.txt
 
diff --git a/package/lua/Config.in b/package/lua/Config.in
index 76359c0..ad454a6 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -1,3 +1,13 @@
+
+choice
+	prompt "Lua Interpreter"
+	default BR2_PACKAGE_LUA_NONE
+
+config BR2_PACKAGE_LUA_NONE
+	bool "none"
+	help
+	  None.
+
 config BR2_PACKAGE_LUA
 	bool "lua"
 	help
@@ -5,6 +15,21 @@ config BR2_PACKAGE_LUA
 
 	  http://www.lua.org/
 
+config BR2_PACKAGE_LUAJIT
+	bool "luajit"
+	# Luajit is only available for some target architectures, and
+	# has some complexity wrt 32/64. See luajit.mk for details.
+	depends on BR2_i386 || (BR2_x86_64 && BR2_HOSTARCH='x86_64') || BR2_powerpc || BR2_arm || BR2_armeb
+	help
+	  LuaJIT implements the full set of language features defined
+	  by Lua 5.1. The virtual machine (VM) is API- and
+	  ABI-compatible to the standard Lua interpreter and can be
+	  deployed as a drop-in replacement.
+
+	  http://luajit.org/
+
+endchoice
+
 if BR2_PACKAGE_LUA
 
 config BR2_PACKAGE_LUA_COMPILER
diff --git a/package/luacjson/luacjson.mk b/package/luacjson/luacjson.mk
index 1f79d5d..de79e9f 100644
--- a/package/luacjson/luacjson.mk
+++ b/package/luacjson/luacjson.mk
@@ -6,7 +6,7 @@
 LUACJSON_VERSION       = 2.1.0
 LUACJSON_SOURCE        = lua-cjson-$(LUACJSON_VERSION).tar.gz
 LUACJSON_SITE          = http://www.kyne.com.au/~mark/software/download
-LUACJSON_DEPENDENCIES  = lua
+LUACJSON_DEPENDENCIES  = $(LUA_INTERPRETER)
 LUACJSON_LICENSE       = MIT
 LUACJSON_LICENSE_FILES = LICENSE
 
diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk
index 2d4c517..435eb8e 100644
--- a/package/luaexpat/luaexpat.mk
+++ b/package/luaexpat/luaexpat.mk
@@ -6,7 +6,7 @@
 
 LUAEXPAT_VERSION      = 1.2.0
 LUAEXPAT_SITE         = http://matthewwild.co.uk/projects/luaexpat
-LUAEXPAT_DEPENDENCIES = lua expat
+LUAEXPAT_DEPENDENCIES = $(LUA_INTERPRETER) expat
 LUAEXPAT_LICENSE      = MIT
 
 
diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk
index 8553212..5e964af 100644
--- a/package/luafilesystem/luafilesystem.mk
+++ b/package/luafilesystem/luafilesystem.mk
@@ -6,7 +6,7 @@
 
 LUAFILESYSTEM_VERSION = 1.5.0
 LUAFILESYSTEM_SITE = http://github.com/downloads/keplerproject/luafilesystem
-LUAFILESYSTEM_DEPENDENCIES = lua
+LUAFILESYSTEM_DEPENDENCIES = $(LUA_INTERPRETER)
 LUAFILESYSTEM_LICENSE = MIT
 
 ifeq ($(BR2_LARGEFILE),y)
diff --git a/package/luajit/Config.in b/package/luajit/Config.in
deleted file mode 100644
index 23b2650..0000000
--- a/package/luajit/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_LUAJIT
-	bool "luajit"
-	# Luajit is only available for some target architectures, and
-	# has some complexity wrt 32/64. See luajit.mk for details.
-	depends on BR2_i386 || (BR2_x86_64 && BR2_HOSTARCH='x86_64') || BR2_powerpc || BR2_arm || BR2_armeb
-	help
-	  LuaJIT implements the full set of language features defined
-	  by Lua 5.1. The virtual machine (VM) is API- and
-	  ABI-compatible to the standard Lua interpreter and can be
-	  deployed as a drop-in replacement.
-
-	  http://luajit.org/
diff --git a/package/luajit/luajit-05-install-like-lua.patch b/package/luajit/luajit-05-install-like-lua.patch
new file mode 100644
index 0000000..8b91805
--- /dev/null
+++ b/package/luajit/luajit-05-install-like-lua.patch
@@ -0,0 +1,17 @@
+Install includes in /usr/include
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,7 @@
+ INSTALL_BIN=   $(DPREFIX)/bin
+ INSTALL_LIB=   $(DPREFIX)/lib
+ INSTALL_SHARE= $(DPREFIX)/share
+-INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
++INSTALL_INC=   $(DPREFIX)/include
+ 
+ INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(VERSION)/jit
+ INSTALL_LMOD= $(INSTALL_SHARE)/lua/$(ABIVER)
diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk
index 45fb9a3..3126ea3 100644
--- a/package/luasocket/luasocket.mk
+++ b/package/luasocket/luasocket.mk
@@ -6,7 +6,7 @@
 
 LUASOCKET_VERSION = 2.0.2
 LUASOCKET_SITE = http://luaforge.net/frs/download.php/2664
-LUASOCKET_DEPENDENCIES = lua
+LUASOCKET_DEPENDENCIES = $(LUA_INTERPRETER)
 LUASOCKET_LICENSE = MIT
 LUASOCKET_LICENSE_FILES = LICENSE
 
diff --git a/package/rings/rings.mk b/package/rings/rings.mk
index e2a2bd7..791cf5e 100644
--- a/package/rings/rings.mk
+++ b/package/rings/rings.mk
@@ -6,7 +6,7 @@
 
 RINGS_VERSION = 1.2.3
 RINGS_SITE = http://github.com/downloads/keplerproject/rings
-RINGS_DEPENDENCIES = lua
+RINGS_DEPENDENCIES = $(LUA_INTERPRETER)
 RINGS_LICENSE = MIT
 
 define RINGS_BUILD_CMDS
diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk
index 0c1c6f1..7f49f4d 100644
--- a/package/xavante/xavante.mk
+++ b/package/xavante/xavante.mk
@@ -6,7 +6,7 @@
 
 XAVANTE_VERSION = 2.2.1
 XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante
-XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi
+XAVANTE_DEPENDENCIES = cgilua copas coxpcall luafilesystem luasocket wsapi
 XAVANTE_LICENSE = MIT
 
 define XAVANTE_INSTALL_TARGET_CMDS
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/5] luajit: allow building for the host
  2012-09-04  6:58 [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2 Francois Perrad
  2012-09-04  6:58 ` [Buildroot] [PATCH 2/5] luajit: complete replacement for lua v2 Francois Perrad
@ 2012-09-04  6:58 ` Francois Perrad
  2013-08-13 22:33   ` Thomas Petazzoni
  2012-09-04  6:58 ` [Buildroot] [PATCH 4/5] lua: remove 3 sub-options, always install all Francois Perrad
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 11+ messages in thread
From: Francois Perrad @ 2012-09-04  6:58 UTC (permalink / raw)
  To: buildroot

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

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 913bc0c..e82df64 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -50,6 +50,11 @@ define LUAJIT_BUILD_CMDS
 		-C $(@D) amalg
 endef
 
+define HOST_LUAJIT_BUILD_CMDS
+	$(MAKE) PREFIX="/usr" \
+		-C $(@D) amalg
+endef
+
 define LUAJIT_INSTALL_STAGING_CMDS
 	$(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" -C $(@D) install
 endef
@@ -58,8 +63,13 @@ define LUAJIT_INSTALL_TARGET_CMDS
 	$(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) install
 endef
 
+define HOST_LUAJIT_INSTALL_CMDS
+	$(MAKE) PREFIX="/usr" DESTDIR="$(HOST_DIR)" -C $(@D) install
+endef
+
 define LUAJIT_CLEAN_CMDS
 	-$(MAKE) -C $(@D) clean
 endef
 
 $(eval $(generic-package))
+$(eval $(host-generic-package))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 4/5] lua: remove 3 sub-options, always install all
  2012-09-04  6:58 [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2 Francois Perrad
  2012-09-04  6:58 ` [Buildroot] [PATCH 2/5] luajit: complete replacement for lua v2 Francois Perrad
  2012-09-04  6:58 ` [Buildroot] [PATCH 3/5] luajit: allow building for the host Francois Perrad
@ 2012-09-04  6:58 ` Francois Perrad
  2012-11-09 21:41   ` Arnout Vandecappelle
  2012-11-15 11:37   ` Peter Korsgaard
  2012-09-04  6:58 ` [Buildroot] [PATCH 5/5] lua: refactor without useless define's Francois Perrad
  2012-11-15 11:36 ` [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2 Peter Korsgaard
  4 siblings, 2 replies; 11+ messages in thread
From: Francois Perrad @ 2012-09-04  6:58 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/lua/Config.in |   18 ------------------
 package/lua/lua.mk    |   18 +-----------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/package/lua/Config.in b/package/lua/Config.in
index ad454a6..febec45 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -32,29 +32,11 @@ endchoice
 
 if BR2_PACKAGE_LUA
 
-config BR2_PACKAGE_LUA_COMPILER
-	bool "lua compiler"
-	select BR2_PACKAGE_LUA_SHARED_LIBRARY
-	help
-	  Install luac binary
-
-config BR2_PACKAGE_LUA_INTERPRETER
-	bool "lua interpreter"
-	select BR2_PACKAGE_LUA_SHARED_LIBRARY
-	help
-	  Install lua binary
-
 config BR2_PACKAGE_LUA_INTERPRETER_READLINE
 	bool "readline support"
-	depends on BR2_PACKAGE_LUA_INTERPRETER
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_NCURSES
 	help
 	  Enables command-line editing in the lua interpreter.
 
-config BR2_PACKAGE_LUA_SHARED_LIBRARY
-	bool "shared library"
-	help
-	  Install shared liblua.so
-
 endif
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index de60c57..4704e4c 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -10,11 +10,7 @@ LUA_INSTALL_STAGING = YES
 LUA_LICENSE = MIT
 LUA_LICENSE_FILES = COPYRIGHT
 
-LUA_CFLAGS = -Wall
-ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
-	LUA_CFLAGS += -fPIC
-endif
-
+LUA_CFLAGS = -Wall -fPIC
 LUA_MYLIBS += -ldl
 
 ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
@@ -46,13 +42,11 @@ define HOST_LUA_BUILD_CMDS
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
 endef
 
-ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
 define LUA_INSTALL_STAGING_SHARED_LIB
 	$(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
 endef
-endif
 
 define LUA_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
@@ -66,29 +60,19 @@ define LUA_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h
 endef
 
-ifeq ($(BR2_PACKAGE_LUA_INTERPRETER),y)
 define LUA_INSTALL_INTERPRETER
 	$(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
 endef
-endif
 
-ifeq ($(BR2_PACKAGE_LUA_COMPILER),y)
 define LUA_INSTALL_COMPILER
 	$(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
 endef
-endif
 
-ifeq ($(BR2_PACKAGE_LUA_SHARED_LIBRARY),y)
 define LUA_INSTALL_LIBRARY
 	$(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
 	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-endef
-else
-define LUA_INSTALL_LIBRARY
-	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-endef
 endif
 
 ifeq ($(BR2_HAVE_DEVFILES),y)
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 5/5] lua: refactor without useless define's
  2012-09-04  6:58 [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2 Francois Perrad
                   ` (2 preceding siblings ...)
  2012-09-04  6:58 ` [Buildroot] [PATCH 4/5] lua: remove 3 sub-options, always install all Francois Perrad
@ 2012-09-04  6:58 ` Francois Perrad
  2012-11-09 21:47   ` Arnout Vandecappelle
  2012-11-15 11:38   ` Peter Korsgaard
  2012-11-15 11:36 ` [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2 Peter Korsgaard
  4 siblings, 2 replies; 11+ messages in thread
From: Francois Perrad @ 2012-09-04  6:58 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/lua/lua.mk |   36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 4704e4c..9e0d387 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -42,39 +42,21 @@ define HOST_LUA_BUILD_CMDS
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
 endef
 
-define LUA_INSTALL_STAGING_SHARED_LIB
-	$(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
-endef
-
 define LUA_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
 		$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
-	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
 	$(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_INTERPRETER
-	$(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
-endef
-
-define LUA_INSTALL_COMPILER
-	$(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
-endef
-
-define LUA_INSTALL_LIBRARY
-	$(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
-	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-endif
-
 ifeq ($(BR2_HAVE_DEVFILES),y)
 define LUA_INSTALL_DEVFILES
 	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
@@ -86,10 +68,14 @@ define LUA_INSTALL_DEVFILES
 endef
 endif
 
+
 define LUA_INSTALL_TARGET_CMDS
-	$(LUA_INSTALL_INTERPRETER)
-	$(LUA_INSTALL_COMPILER)
-	$(LUA_INSTALL_LIBRARY)
+	$(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
+	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
 	$(LUA_INSTALL_DEVFILES)
 endef
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 4/5] lua: remove 3 sub-options, always install all
  2012-09-04  6:58 ` [Buildroot] [PATCH 4/5] lua: remove 3 sub-options, always install all Francois Perrad
@ 2012-11-09 21:41   ` Arnout Vandecappelle
  2012-11-15 11:37   ` Peter Korsgaard
  1 sibling, 0 replies; 11+ messages in thread
From: Arnout Vandecappelle @ 2012-11-09 21:41 UTC (permalink / raw)
  To: buildroot

On 09/04/12 08:58, Francois Perrad wrote:
> Signed-off-by: Francois Perrad<francois.perrad@gadz.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

  Peter, please commit this one before -rc1, it fixes
http://autobuild.buildroot.net/results/d47b983abde8eebe02c228d638101b8d5cd92965/

  Regards,
  Arnout
-- 
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
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

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 5/5] lua: refactor without useless define's
  2012-09-04  6:58 ` [Buildroot] [PATCH 5/5] lua: refactor without useless define's Francois Perrad
@ 2012-11-09 21:47   ` Arnout Vandecappelle
  2012-11-15 11:38   ` Peter Korsgaard
  1 sibling, 0 replies; 11+ messages in thread
From: Arnout Vandecappelle @ 2012-11-09 21:47 UTC (permalink / raw)
  To: buildroot

On 09/04/12 08:58, Francois Perrad wrote:
> Signed-off-by: Francois Perrad<francois.perrad@gadz.org>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
  (build test on a few configs)

  Regards,
  Arnout
-- 
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
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

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2
  2012-09-04  6:58 [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2 Francois Perrad
                   ` (3 preceding siblings ...)
  2012-09-04  6:58 ` [Buildroot] [PATCH 5/5] lua: refactor without useless define's Francois Perrad
@ 2012-11-15 11:36 ` Peter Korsgaard
  4 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2012-11-15 11:36 UTC (permalink / raw)
  To: buildroot

>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

 Francois> Signed-off-by: Wojciech M. Zabolotny <wzab01@gmail.com>
 Francois> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
 Francois> ---
 Francois>  package/Config.in                                |    1 +
 Francois>  package/lua-msgpack-native/Config.in             |    7 ++++++
 Francois>  package/lua-msgpack-native/lua-msgpack-native.mk |   29 ++++++++++++++++++++++
 Francois>  3 files changed, 37 insertions(+)
 Francois>  create mode 100644 package/lua-msgpack-native/Config.in
 Francois>  create mode 100644 package/lua-msgpack-native/lua-msgpack-native.mk

 Francois> diff --git a/package/Config.in b/package/Config.in
 Francois> index f308de7..f05f5f4 100644
 Francois> --- a/package/Config.in
 Francois> +++ b/package/Config.in
 Francois> @@ -257,6 +257,7 @@ source "package/luacjson/Config.in"
 Francois>  source "package/luaexpat/Config.in"
 Francois>  source "package/luafilesystem/Config.in"
 Francois>  source "package/luasocket/Config.in"
 Francois> +source "package/lua-msgpack-native/Config.in"
 Francois>  source "package/rings/Config.in"
 Francois>  source "package/wsapi/Config.in"
 Francois>  source "package/xavante/Config.in"
 Francois> diff --git a/package/lua-msgpack-native/Config.in b/package/lua-msgpack-native/Config.in
 Francois> new file mode 100644
 Francois> index 0000000..90eecc3
 Francois> --- /dev/null
 Francois> +++ b/package/lua-msgpack-native/Config.in
 Francois> @@ -0,0 +1,7 @@
 Francois> +config BR2_PACKAGE_LUA_MSGPACK_NATIVE
 Francois> +	bool "lua-msgpack-native"
 Francois> +	help
 Francois> +	  This is a native, C language implementation of msgpack (http://msgpack.org)

This doesn't fit in the normal 80-col menuconfig window. I've
reformatted it and committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 4/5] lua: remove 3 sub-options, always install all
  2012-09-04  6:58 ` [Buildroot] [PATCH 4/5] lua: remove 3 sub-options, always install all Francois Perrad
  2012-11-09 21:41   ` Arnout Vandecappelle
@ 2012-11-15 11:37   ` Peter Korsgaard
  1 sibling, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2012-11-15 11:37 UTC (permalink / raw)
  To: buildroot

>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

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

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 5/5] lua: refactor without useless define's
  2012-09-04  6:58 ` [Buildroot] [PATCH 5/5] lua: refactor without useless define's Francois Perrad
  2012-11-09 21:47   ` Arnout Vandecappelle
@ 2012-11-15 11:38   ` Peter Korsgaard
  1 sibling, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2012-11-15 11:38 UTC (permalink / raw)
  To: buildroot

>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

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

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/5] luajit: allow building for the host
  2012-09-04  6:58 ` [Buildroot] [PATCH 3/5] luajit: allow building for the host Francois Perrad
@ 2013-08-13 22:33   ` Thomas Petazzoni
  0 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-08-13 22:33 UTC (permalink / raw)
  To: buildroot

Dear Francois Perrad,

Why is the below patch needed? What is the usage of luajit built for
the host?

Thanks,

Thomas

On Tue,  4 Sep 2012 08:58:39 +0200, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/luajit/luajit.mk |   10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
> index 913bc0c..e82df64 100644
> --- a/package/luajit/luajit.mk
> +++ b/package/luajit/luajit.mk
> @@ -50,6 +50,11 @@ define LUAJIT_BUILD_CMDS
>  		-C $(@D) amalg
>  endef
>  
> +define HOST_LUAJIT_BUILD_CMDS
> +	$(MAKE) PREFIX="/usr" \
> +		-C $(@D) amalg
> +endef
> +
>  define LUAJIT_INSTALL_STAGING_CMDS
>  	$(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" -C $(@D) install
>  endef
> @@ -58,8 +63,13 @@ define LUAJIT_INSTALL_TARGET_CMDS
>  	$(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) install
>  endef
>  
> +define HOST_LUAJIT_INSTALL_CMDS
> +	$(MAKE) PREFIX="/usr" DESTDIR="$(HOST_DIR)" -C $(@D) install
> +endef
> +
>  define LUAJIT_CLEAN_CMDS
>  	-$(MAKE) -C $(@D) clean
>  endef
>  
>  $(eval $(generic-package))
> +$(eval $(host-generic-package))



-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-08-13 22:33 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-04  6:58 [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2 Francois Perrad
2012-09-04  6:58 ` [Buildroot] [PATCH 2/5] luajit: complete replacement for lua v2 Francois Perrad
2012-09-04  6:58 ` [Buildroot] [PATCH 3/5] luajit: allow building for the host Francois Perrad
2013-08-13 22:33   ` Thomas Petazzoni
2012-09-04  6:58 ` [Buildroot] [PATCH 4/5] lua: remove 3 sub-options, always install all Francois Perrad
2012-11-09 21:41   ` Arnout Vandecappelle
2012-11-15 11:37   ` Peter Korsgaard
2012-09-04  6:58 ` [Buildroot] [PATCH 5/5] lua: refactor without useless define's Francois Perrad
2012-11-09 21:47   ` Arnout Vandecappelle
2012-11-15 11:38   ` Peter Korsgaard
2012-11-15 11:36 ` [Buildroot] [PATCH 1/5] lua-msgpack-native: new package v2 Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.