diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-04-22 11:58:08 +0200 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-04-22 11:58:08 +0200 |
commit | 08469050076ff2d97aeba01e26984aefdf77b6e4 (patch) | |
tree | 6ae6d015b689203c87f77e824c06a9782b417011 /packages/scripting-languages/lua | |
parent | 394ae20e7f61a7237783f96a50629f5cd083c82d (diff) | |
download | embtoolkit-08469050076ff2d97aeba01e26984aefdf77b6e4.tar.gz embtoolkit-08469050076ff2d97aeba01e26984aefdf77b6e4.tar.bz2 embtoolkit-08469050076ff2d97aeba01e26984aefdf77b6e4.tar.xz |
Packages: lua: add lua-5.1.5 and fix install
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages/scripting-languages/lua')
-rw-r--r-- | packages/scripting-languages/lua/lua.kconfig | 28 | ||||
-rw-r--r-- | packages/scripting-languages/lua/lua.mk | 26 |
2 files changed, 34 insertions, 20 deletions
diff --git a/packages/scripting-languages/lua/lua.kconfig b/packages/scripting-languages/lua/lua.kconfig index 4ef5998..968d354 100644 --- a/packages/scripting-languages/lua/lua.kconfig +++ b/packages/scripting-languages/lua/lua.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010-2010 Abdoulaye Walsimou GAYE. +# Copyright(C) 2010-2012 Abdoulaye Walsimou GAYE. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,29 +25,31 @@ config EMBTK_HAVE_LUA bool "Have lua" + select EMBTK_LUA_NEED_PATCH help - Lua is a powerful, light-weight programming language designed - for extending applications. Lua is also frequently used as a - general-purpose, stand-alone language. Lua is free software. + Lua is a powerful, fast, lightweight, embeddable scripting + language. + Lua combines simple procedural syntax with powerful data + description constructs based on associative arrays and + extensible semantics. Lua is dynamically typed, runs by + interpreting bytecode for a register-based virtual machine, + and has automatic memory management with incremental garbage + collection, making it ideal for configuration, scripting, and + rapid prototyping. + choice prompt "lua version you wish" depends on EMBTK_HAVE_LUA help Here you can choose which version of lua you want to use. - config EMBTK_LUA_VERSION_5_1 - bool "lua-5.1" + config EMBTK_LUA_VERSION_5_1_5 + bool "lua-5.1.5" endchoice config EMBTK_LUA_VERSION_STRING string - default "5.1" if EMBTK_LUA_VERSION_5_1 + default "5.1.5" if EMBTK_LUA_VERSION_5_1_5 config EMBTK_LUA_NEED_PATCH bool -config EMBTK_LUA_NEED_AUTORECONF - bool -config EMBTK_LUA_PKG_IS_TARGZ - bool -config EMBTK_LUA_PKG_IS_TARBZ2 - bool diff --git a/packages/scripting-languages/lua/lua.mk b/packages/scripting-languages/lua/lua.mk index 6017a5e..9ec818c 100644 --- a/packages/scripting-languages/lua/lua.mk +++ b/packages/scripting-languages/lua/lua.mk @@ -25,8 +25,8 @@ LUA_NAME := lua LUA_VERSION := $(call embtk_get_pkgversion,lua) -LUA_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/lua -LUA_PACKAGE := lua-$(LUA_VERSION).tar.bz2 +LUA_SITE := http://www.lua.org/ftp +LUA_PACKAGE := lua-$(LUA_VERSION).tar.gz LUA_SRC_DIR := $(PACKAGES_BUILD)/lua-$(LUA_VERSION) LUA_BUILD_DIR := $(PACKAGES_BUILD)/lua-$(LUA_VERSION) @@ -34,18 +34,30 @@ LUA_BINS = lua luac LUA_SBINS = LUA_INCLUDES = lauxlib.h luaconf.h lua.h lua.hpp lualib.h LUA_LIBS = lua liblua.* -LUA_PKGCONFIGS = +LUA_PKGCONFIGS = lua.pc +LUA_SHARES = lua LUA_DEPS = +LUACONF_H_OPTS = -DCONFIG_LUA_ROOT="/usr/" -DCONFIG_SYSTEM_LIBDIR="$(LIBDIR)/" -LUA_MAKE_OPTS = INSTALL_TOP=$(SYSROOT)/usr/ LIBDIR=$(LIBDIR) +LUA_MAKE_OPTS = INSTALL_TOP=$(SYSROOT)/usr/ LIBDIR=$(LIBDIR) PLAT=ansi lua_install: $(call embtk_makeinstall_pkg,lua) define embtk_beforeinstall_lua $(Q)$(MAKE) -C $(LUA_BUILD_DIR) CC=$(TARGETCC_CACHED) \ - AR="$(TARGETAR) rcu" RANLIB=$(TARGETRANLIB) \ - LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ - CFLAGS="$(TARGET_CFLAGS) -I$(SYSROOT)/usr/include" ansi + AR="$(TARGETAR) rcu" RANLIB=$(TARGETRANLIB) \ + LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ + CFLAGS="$(TARGET_CFLAGS) -I$(SYSROOT)/usr/include $(LUACONF_H_OPTS)" \ + PLAT=ansi +endef + +define embtk_postinstall_lua + $(Q)mkdir -p $(ROOTFS) + $(Q)mkdir -p $(ROOTFS)/usr + $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) + $(Q)mkdir -p $(ROOTFS)/usr/share + $(Q)cp -R $(SYSROOT)/usr/$(LIBDIR)/lua $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)cp -R $(SYSROOT)/usr/share/lua $(ROOTFS)/usr/share/ endef |