* [Buildroot] [PATCH 2/2] luajit: allow to build Lua extensions without lua
2012-12-15 9:33 [Buildroot] [PATCH 1/2] lua: remove built dependencies Francois Perrad
@ 2012-12-15 9:33 ` Francois Perrad
2013-03-04 21:29 ` Thomas Petazzoni
2013-01-08 7:36 ` [Buildroot] [PATCH 1/2] lua: remove built dependencies François Perrad
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Francois Perrad @ 2012-12-15 9:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/Makefile.in | 6 ++++++
package/lua-msgpack-native/lua-msgpack-native.mk | 2 +-
package/luacjson/luacjson.mk | 2 +-
package/luaexpat/luaexpat.mk | 2 +-
package/luafilesystem/luafilesystem.mk | 2 +-
package/luajit/luajit.mk | 11 ++++++++++-
package/luasocket/luasocket.mk | 2 +-
package/rings/rings.mk | 2 +-
8 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index 8dea51e..c19887b 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -307,6 +307,12 @@ else
SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
endif
+ifeq ($(BR2_PACKAGE_LUA),y)
+LUA_INTERPRETER = lua
+else ifeq ($(BR2_PACKAGE_LUAJIT),y)
+LUA_INTERPRETER = luajit
+endif
+
include package/pkg-utils.mk
include package/pkg-download.mk
include package/pkg-autotools.mk
diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk
index 97ce83c..5387f53 100644
--- a/package/lua-msgpack-native/lua-msgpack-native.mk
+++ b/package/lua-msgpack-native/lua-msgpack-native.mk
@@ -5,7 +5,7 @@
#############################################################
LUA_MSGPACK_NATIVE_VERSION = g41cce91
LUA_MSGPACK_NATIVE_SITE = http://github.com/kengonakajima/lua-msgpack-native/tarball/master
-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/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/luajit.mk b/package/luajit/luajit.mk
index 844122e..d7e5d4d 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -4,7 +4,10 @@
#
#############################################################
-LUAJIT_VERSION = 2.0.0
+LUAJIT_MAJVER= 2
+LUAJIT_MINVER= 0
+LUAJIT_RELVER= 0
+LUAJIT_VERSION = $(LUAJIT_MAJVER).$(LUAJIT_MINVER).$(LUAJIT_RELVER)
LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz
LUAJIT_SITE = http://luajit.org/download
LUAJIT_LICENSE = MIT
@@ -47,8 +50,14 @@ define LUAJIT_BUILD_CMDS
-C $(@D) amalg
endef
+LUAJIT_FILES_INC= lua.h lualib.h lauxlib.h luaconf.h lua.hpp
+
define LUAJIT_INSTALL_STAGING_CMDS
$(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" -C $(@D) install
+ for i in $(LUAJIT_FILES_INC); do \
+ ln -sf $(STAGING_DIR)/usr/include/luajit-$(LUAJIT_MAJVER).$(LUAJIT_MINVER)/$$i \
+ $(STAGING_DIR)/usr/include/$$i; \
+ done
endef
define LUAJIT_INSTALL_TARGET_CMDS
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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/2] luajit: allow to build Lua extensions without lua
2012-12-15 9:33 ` [Buildroot] [PATCH 2/2] luajit: allow to build Lua extensions without lua Francois Perrad
@ 2013-03-04 21:29 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2013-03-04 21:29 UTC (permalink / raw)
To: buildroot
Dear Francois Perrad,
On Sat, 15 Dec 2012 10:33:22 +0100, Francois Perrad wrote:
> diff --git a/package/Makefile.in b/package/Makefile.in
> index 8dea51e..c19887b 100644
> --- a/package/Makefile.in
> +++ b/package/Makefile.in
> @@ -307,6 +307,12 @@ else
> SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
> endif
>
> +ifeq ($(BR2_PACKAGE_LUA),y)
> +LUA_INTERPRETER = lua
> +else ifeq ($(BR2_PACKAGE_LUAJIT),y)
> +LUA_INTERPRETER = luajit
> +endif
I think what we want instead here is a virtual package, in the sense of
the OpenGL virtual package I proposed in my Qt5 patch set. See
http://git.free-electrons.com/users/thomas-petazzoni/buildroot/commit/?h=qt5&id=31ceec3926db7fea4fa2ac4b328b022bcec97aac.
In your case, it could be package/luainterpreter/Config.in:
config BR2_PACKAGE_HAS_LUA_INTERPRETER
bool
package/luainterpreter/luainterpreter.mk:
LUAINTERPRETER_SOURCE =
ifeq ($(BR2_PACKAGE_LUA),y)
LUAINTERPRETER_DEPENDENCIES = lua
endif
ifeq ($(BR2_PACKAGE_LUAJIT),y)
LUAINTERPRETER_DEPENDENCIES = luajit
endif
$(eval $(generic-package))
and then package/lua/Config.in and package/luajit/Config.in would
'select BR2_PACKAGE_HAS_LUA_INTERPRETER'.
And all lua modules would do a 'depends on
BR2_PACKAGE_HAS_LUA_INTERPRETER' and have <pkg>_DEPENDENCIES =
luainterpreter in their .mk file.
Best regards,
Thomas
--
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] 6+ messages in thread
* [Buildroot] [PATCH 1/2] lua: remove built dependencies
2012-12-15 9:33 [Buildroot] [PATCH 1/2] lua: remove built dependencies Francois Perrad
2012-12-15 9:33 ` [Buildroot] [PATCH 2/2] luajit: allow to build Lua extensions without lua Francois Perrad
@ 2013-01-08 7:36 ` François Perrad
2013-03-04 20:48 ` François Perrad
2013-03-04 21:24 ` Thomas Petazzoni
3 siblings, 0 replies; 6+ messages in thread
From: François Perrad @ 2013-01-08 7:36 UTC (permalink / raw)
To: buildroot
ping
2012/12/15 Francois Perrad <fperrad@gmail.com>:
> runtime dependencies are handled in Config.in
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/cgilua/cgilua.mk | 1 -
> package/copas/copas.mk | 1 -
> package/coxpcall/coxpcall.mk | 1 -
> package/wsapi/wsapi.mk | 1 -
> package/xavante/xavante.mk | 1 -
> 5 files changed, 5 deletions(-)
>
> diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk
> index 48ee005..184d836 100644
> --- a/package/cgilua/cgilua.mk
> +++ b/package/cgilua/cgilua.mk
> @@ -6,7 +6,6 @@
>
> CGILUA_VERSION = 5.1.4
> CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua
> -CGILUA_DEPENDENCIES = luafilesystem
> CGILUA_LICENSE = MIT
>
> define CGILUA_INSTALL_TARGET_CMDS
> diff --git a/package/copas/copas.mk b/package/copas/copas.mk
> index c84a6cc..d3e6576 100644
> --- a/package/copas/copas.mk
> +++ b/package/copas/copas.mk
> @@ -6,7 +6,6 @@
>
> COPAS_VERSION = 1.1.6
> COPAS_SITE = http://github.com/downloads/keplerproject/copas
> -COPAS_DEPENDENCIES = lua 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/wsapi/wsapi.mk b/package/wsapi/wsapi.mk
> index eb2b51c..4628530 100644
> --- a/package/wsapi/wsapi.mk
> +++ b/package/wsapi/wsapi.mk
> @@ -6,7 +6,6 @@
>
> WSAPI_VERSION = 1.5
> WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi
> -WSAPI_DEPENDENCIES = coxpcall luafilesystem rings
> WSAPI_LICENSE = MIT
>
> define WSAPI_INSTALL_TARGET_CMDS
> diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk
> index 0c1c6f1..d1ca320 100644
> --- a/package/xavante/xavante.mk
> +++ b/package/xavante/xavante.mk
> @@ -6,7 +6,6 @@
>
> XAVANTE_VERSION = 2.2.1
> XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante
> -XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi
> XAVANTE_LICENSE = MIT
>
> define XAVANTE_INSTALL_TARGET_CMDS
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] lua: remove built dependencies
2012-12-15 9:33 [Buildroot] [PATCH 1/2] lua: remove built dependencies Francois Perrad
2012-12-15 9:33 ` [Buildroot] [PATCH 2/2] luajit: allow to build Lua extensions without lua Francois Perrad
2013-01-08 7:36 ` [Buildroot] [PATCH 1/2] lua: remove built dependencies François Perrad
@ 2013-03-04 20:48 ` François Perrad
2013-03-04 21:24 ` Thomas Petazzoni
3 siblings, 0 replies; 6+ messages in thread
From: François Perrad @ 2013-03-04 20:48 UTC (permalink / raw)
To: buildroot
ping
2012/12/15 Francois Perrad <fperrad@gmail.com>:
> runtime dependencies are handled in Config.in
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/cgilua/cgilua.mk | 1 -
> package/copas/copas.mk | 1 -
> package/coxpcall/coxpcall.mk | 1 -
> package/wsapi/wsapi.mk | 1 -
> package/xavante/xavante.mk | 1 -
> 5 files changed, 5 deletions(-)
>
> diff --git a/package/cgilua/cgilua.mk b/package/cgilua/cgilua.mk
> index 48ee005..184d836 100644
> --- a/package/cgilua/cgilua.mk
> +++ b/package/cgilua/cgilua.mk
> @@ -6,7 +6,6 @@
>
> CGILUA_VERSION = 5.1.4
> CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua
> -CGILUA_DEPENDENCIES = luafilesystem
> CGILUA_LICENSE = MIT
>
> define CGILUA_INSTALL_TARGET_CMDS
> diff --git a/package/copas/copas.mk b/package/copas/copas.mk
> index c84a6cc..d3e6576 100644
> --- a/package/copas/copas.mk
> +++ b/package/copas/copas.mk
> @@ -6,7 +6,6 @@
>
> COPAS_VERSION = 1.1.6
> COPAS_SITE = http://github.com/downloads/keplerproject/copas
> -COPAS_DEPENDENCIES = lua 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/wsapi/wsapi.mk b/package/wsapi/wsapi.mk
> index eb2b51c..4628530 100644
> --- a/package/wsapi/wsapi.mk
> +++ b/package/wsapi/wsapi.mk
> @@ -6,7 +6,6 @@
>
> WSAPI_VERSION = 1.5
> WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi
> -WSAPI_DEPENDENCIES = coxpcall luafilesystem rings
> WSAPI_LICENSE = MIT
>
> define WSAPI_INSTALL_TARGET_CMDS
> diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk
> index 0c1c6f1..d1ca320 100644
> --- a/package/xavante/xavante.mk
> +++ b/package/xavante/xavante.mk
> @@ -6,7 +6,6 @@
>
> XAVANTE_VERSION = 2.2.1
> XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante
> -XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi
> XAVANTE_LICENSE = MIT
>
> define XAVANTE_INSTALL_TARGET_CMDS
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] lua: remove built dependencies
2012-12-15 9:33 [Buildroot] [PATCH 1/2] lua: remove built dependencies Francois Perrad
` (2 preceding siblings ...)
2013-03-04 20:48 ` François Perrad
@ 2013-03-04 21:24 ` Thomas Petazzoni
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2013-03-04 21:24 UTC (permalink / raw)
To: buildroot
Dear Francois Perrad,
On Sat, 15 Dec 2012 10:33:21 +0100, Francois Perrad wrote:
> runtime dependencies are handled in Config.in
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
If those are runtime dependencies only, then you need to update the
Config.in file to add a comment explaining that it's a runtime
dependency. Generally, when a package selects another one in its
Config.in, we expect the .mk file to have this dependency as well. When
it's not the case, we want a comment that explains why.
# Runtime dependency only
select BR2_PACKAGE_LUAFILESYSTEM
Could you post an updated version of your [PATCH 1/2] with this change?
Thanks,
Thomas
--
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] 6+ messages in thread