Skip to contentSkip to conversation

lua: remove built dependencies

PATCH Superseded Francois Perrad 3 participants 6 messages Dec 15, 2012 – Mar 4, 2013

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 lua: remove built dependencies

runtime dependencies are handled in Config.in

---
 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(-)
package/cgilua/cgilua.mk +0 -1
index 48ee005..184d836 100644
@@ -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
package/copas/copas.mk +0 -1
index c84a6cc..d3e6576 100644
@@ -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
package/coxpcall/coxpcall.mk +0 -1
index e7fb76d..329d6fd 100644
@@ -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
package/wsapi/wsapi.mk +0 -1
index eb2b51c..4628530 100644
@@ -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
package/xavante/xavante.mk +0 -1
index 0c1c6f1..d1ca320 100644
@@ -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
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 lua: remove built dependencies

ping

2012/12/15 Francois Perrad <[email protected]>:

Quoted 74 lines

runtime dependencies are handled in Config.in

---
 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(-)
package/cgilua/cgilua.mk +0 -1
index 48ee005..184d836 100644
@@ -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
package/copas/copas.mk +0 -1
index c84a6cc..d3e6576 100644
@@ -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
package/coxpcall/coxpcall.mk +0 -1
index e7fb76d..329d6fd 100644
@@ -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
package/wsapi/wsapi.mk +0 -1
index eb2b51c..4628530 100644
@@ -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
package/xavante/xavante.mk +0 -2
index 0c1c6f1..d1ca320 100644
@@ -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

#2 lore raw

PATCH 2/2 luajit: allow to build Lua extensions without lua

In reply to Francois Perrad
---
 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(-)
package/Makefile.in +6 -0
index 8dea51e..c19887b 100644
@@ -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
package/lua-msgpack-native/lua-msgpack-native.mk +1 -1
index 97ce83c..5387f53 100644
@@ -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
 
package/luacjson/luacjson.mk +1 -1
index 1f79d5d..de79e9f 100644
@@ -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
 
package/luaexpat/luaexpat.mk +1 -1
index 2d4c517..435eb8e 100644
@@ -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
 
 
package/luafilesystem/luafilesystem.mk +1 -1
index 8553212..5e964af 100644
@@ -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)
package/luajit/luajit.mk +10 -1
index 844122e..d7e5d4d 100644
@@ -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
package/luasocket/luasocket.mk +1 -1
index 45fb9a3..3126ea3 100644
@@ -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
 
package/rings/rings.mk +1 -1
index e2a2bd7..791cf5e 100644
@@ -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
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 2/2 luajit: allow to build Lua extensions without lua

Dear Francois Perrad,

package/Makefile.in else · line 314

Quoted 13 lines · Francois Perrad
package/Makefile.in +5 -0
index 8dea51e..c19887b 100644
@@ -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

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#4 lore raw

PATCH 1/2 lua: remove built dependencies

In reply to Francois Perrad

ping

2012/12/15 Francois Perrad <[email protected]>:

Quoted 74 lines

runtime dependencies are handled in Config.in

---
 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(-)
package/cgilua/cgilua.mk +0 -1
index 48ee005..184d836 100644
@@ -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
package/copas/copas.mk +0 -1
index c84a6cc..d3e6576 100644
@@ -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
package/coxpcall/coxpcall.mk +0 -1
index e7fb76d..329d6fd 100644
@@ -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
package/wsapi/wsapi.mk +0 -1
index eb2b51c..4628530 100644
@@ -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
package/xavante/xavante.mk +0 -2
index 0c1c6f1..d1ca320 100644
@@ -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

#5 lore raw

PATCH 1/2 lua: remove built dependencies

In reply to Francois Perrad

Dear Francois Perrad,

Quoted 3 lines · Francois Perrad

runtime dependencies are handled in Config.in

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

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