From patchwork Wed Jan 15 19:54:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 311257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id CFEA32C009A for ; Thu, 16 Jan 2014 06:54:59 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1DA248B994; Wed, 15 Jan 2014 19:54:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Nolesw9XMngD; Wed, 15 Jan 2014 19:54:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1FA388B970; Wed, 15 Jan 2014 19:54:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2AF281C1766 for ; Wed, 15 Jan 2014 19:54:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 236BF85270 for ; Wed, 15 Jan 2014 19:54:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7nCiEW3iX1jm for ; Wed, 15 Jan 2014 19:54:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by whitealder.osuosl.org (Postfix) with ESMTPS id AB0C58BE2E for ; Wed, 15 Jan 2014 19:54:45 +0000 (UTC) Received: by mail-we0-f179.google.com with SMTP id w62so2231670wes.24 for ; Wed, 15 Jan 2014 11:54:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6KW56G0XEkrS3c24oSzu4ff+yJkAhedX44GmJJpcPn8=; b=chTDqwxaWsrm1zxQIBawSpNsSjtUYBTWrCz2Lrf07M/2rHIrsUA8Iaq3OMXWwqLu82 B0DV/D+WizMLHqj5gyqyFgOjWZk52tvQhSS0O7BjPVarx3rgCtzjvIvbC0DZVjrgJ1rv AETzSU45Jjgfi/9aDV3Jdtye9cgP3HyLnCiChprGtgH+VCW2DBPOs7TaapT9JWIJSRwe 9p/UnXggTWRbbGgsEdrb5xCn01dqNOdcdDgvS5HFrP7n2T6gKF41bp35fq1Rc9qAKW+J c+0EnfvdQtATCVw+M1ZAdNNzB4eHKF2FXdlnJMnn3VQ+2Jj+KS2o7euya4aX7ghQMEox D1uQ== X-Received: by 10.194.63.228 with SMTP id j4mr4418466wjs.34.1389815684211; Wed, 15 Jan 2014 11:54:44 -0800 (PST) Received: from ubuntu.localdomain (94.166.87.79.rev.sfr.net. [79.87.166.94]) by mx.google.com with ESMTPSA id mv9sm8206223wic.1.2014.01.15.11.54.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 11:54:43 -0800 (PST) From: Francois Perrad To: buildroot@busybox.net Date: Wed, 15 Jan 2014 20:54:33 +0100 Message-Id: <1389815674-14759-2-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389815674-14759-1-git-send-email-francois.perrad@gadz.org> References: <1389815674-14759-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [V2 2/3] lua-modules: choice between Lua 5.1.x & Lua 5.2.x X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Francois Perrad --- package/lbase64/Config.in | 4 ++++ package/lua-ev/lua-ev.mk | 2 +- package/lua-msgpack-native/Config.in | 4 ++++ package/lua-msgpack-native/lua-msgpack-native.mk | 3 ++- package/luaexpat/Config.in | 4 ++++ package/luaexpatutils/Config.in | 4 ++++ package/luaexpatutils/luaexpatutils.mk | 2 +- package/luaposix/Config.in | 2 +- package/luaposix/luaposix.mk | 2 +- package/luarocks/luarocks.mk | 4 ++-- package/luasec/Config.in | 4 ++++ 11 files changed, 28 insertions(+), 7 deletions(-) diff --git a/package/lbase64/Config.in b/package/lbase64/Config.in index ca9dd5d..4593ab9 100644 --- a/package/lbase64/Config.in +++ b/package/lbase64/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_LBASE64 bool "lbase64" depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + depends on !BR2_PACKAGE_LUA_5_2 help A base64 library for Lua http://luaforge.net/projects/lbase64/ + +comment "lbase64 needs a Lua 5.1 interpreter" + depends on BR2_PACKAGE_LUA_5_2 diff --git a/package/lua-ev/lua-ev.mk b/package/lua-ev/lua-ev.mk index 1236d77..1b10a80 100644 --- a/package/lua-ev/lua-ev.mk +++ b/package/lua-ev/lua-ev.mk @@ -9,6 +9,6 @@ LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION)) LUA_EV_DEPENDENCIES = luainterpreter libev LUA_EV_LICENSE = MIT LUA_EV_LICENSE_FILES = README -LUA_EV_CONF_OPT = -DINSTALL_CMOD="/usr/lib/lua/5.1" +LUA_EV_CONF_OPT = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" $(eval $(cmake-package)) diff --git a/package/lua-msgpack-native/Config.in b/package/lua-msgpack-native/Config.in index 1014298..498b30c 100644 --- a/package/lua-msgpack-native/Config.in +++ b/package/lua-msgpack-native/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_LUA_MSGPACK_NATIVE bool "lua-msgpack-native" depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + depends on !BR2_PACKAGE_LUA_5_2 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 + +comment "lua-msgpack-native needs a Lua 5.1 interpreter" + depends on BR2_PACKAGE_LUA_5_2 diff --git a/package/lua-msgpack-native/lua-msgpack-native.mk b/package/lua-msgpack-native/lua-msgpack-native.mk index d4547ae..ceb453d 100644 --- a/package/lua-msgpack-native/lua-msgpack-native.mk +++ b/package/lua-msgpack-native/lua-msgpack-native.mk @@ -15,7 +15,8 @@ define LUA_MSGPACK_NATIVE_BUILD_CMDS endef define LUA_MSGPACK_NATIVE_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/msgpack.so $(TARGET_DIR)/usr/lib/lua/5.1/msgpack.so + $(INSTALL) -m 755 -D $(@D)/msgpack.so \ + $(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)/msgpack.so endef $(eval $(generic-package)) diff --git a/package/luaexpat/Config.in b/package/luaexpat/Config.in index f8db318..f1bd15d 100644 --- a/package/luaexpat/Config.in +++ b/package/luaexpat/Config.in @@ -2,7 +2,11 @@ config BR2_PACKAGE_LUAEXPAT bool "luaexpat" select BR2_PACKAGE_EXPAT depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + depends on !BR2_PACKAGE_LUA_5_2 help LuaExpat is a SAX XML parser based on the Expat library. http://matthewwild.co.uk/projects/luaexpat/ + +comment "LuaExpat needs a Lua 5.1 interpreter" + depends on BR2_PACKAGE_LUA_5_2 diff --git a/package/luaexpatutils/Config.in b/package/luaexpatutils/Config.in index cb2887a..9b406c8 100644 --- a/package/luaexpatutils/Config.in +++ b/package/luaexpatutils/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_LUAEXPATUTILS bool "luaexpatutils" select BR2_PACKAGE_LUAEXPAT + depends on !BR2_PACKAGE_LUA_5_2 help lxp.doc is a module that provides useful features for working with XML formats in LOM format as used by the LuaExpat project from Kepler. https://github.com/stevedonovan/LuaExpatUtils + +comment "LuaExpatUtils needs a Lua 5.1 interpreter" + depends on BR2_PACKAGE_LUA_5_2 diff --git a/package/luaexpatutils/luaexpatutils.mk b/package/luaexpatutils/luaexpatutils.mk index 93cf621..9bfc654 100644 --- a/package/luaexpatutils/luaexpatutils.mk +++ b/package/luaexpatutils/luaexpatutils.mk @@ -11,7 +11,7 @@ LUAEXPATUTILS_DEPENDENCIES = luaexpat define LUAEXPATUTILS_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/lua/doc.lua \ - $(TARGET_DIR)/usr/share/lua/5.1/lxp/doc.lua + $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/lxp/doc.lua endef $(eval $(generic-package)) diff --git a/package/luaposix/Config.in b/package/luaposix/Config.in index cad6fe9..a95c825 100644 --- a/package/luaposix/Config.in +++ b/package/luaposix/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LUAPOSIX bool "luaposix" depends on BR2_PACKAGE_HAS_LUA_INTERPRETER - select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA + select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1 # LuaBitOp is already included in LuaJIT help luaposix is a POSIX binding, including curses, for Lua 5.1 diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index b018995..77f5e62 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -10,7 +10,7 @@ LUAPOSIX_SOURCE = release-v$(LUAPOSIX_VERSION).tar.gz LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = COPYING LUAPOSIX_DEPENDENCIES = luainterpreter host-lua -LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua/5.1" --datarootdir="/usr/share/lua/5.1" +LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)" ifeq ($(BR2_PACKAGE_NCURSES),y) LUAPOSIX_DEPENDENCIES += ncurses diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 6cfd92e..88ab22a 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -12,7 +12,7 @@ LUAROCKS_LICENSE_FILES = COPYING HOST_LUAROCKS_DEPENDENCIES = host-lua luainterpreter LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks -LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-5.1.lua +LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua define HOST_LUAROCKS_CONFIGURE_CMDS cd $(@D) && ./configure \ @@ -41,5 +41,5 @@ endef $(eval $(host-generic-package)) -LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/5.1/?.lua" \ +LUAROCKS_RUN = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" \ $(HOST_DIR)/usr/bin/lua $(HOST_DIR)/usr/bin/luarocks diff --git a/package/luasec/Config.in b/package/luasec/Config.in index ed55df7..54e1842 100644 --- a/package/luasec/Config.in +++ b/package/luasec/Config.in @@ -3,8 +3,12 @@ config BR2_PACKAGE_LUASEC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LUASOCKET depends on BR2_PACKAGE_HAS_LUA_INTERPRETER + depends on !BR2_PACKAGE_LUA_5_2 help LuaSec is a binding for OpenSSL library to provide TLS/SSL communication. http://www.inf.puc-rio.br/~brunoos/luasec/ + +comment "LuaSec needs a Lua 5.1 interpreter" + depends on BR2_PACKAGE_LUA_5_2