diff options
| author | Francois Perrad <fperrad@gmail.com> | 2014-01-17 18:47:35 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-01-21 23:27:13 +0100 |
| commit | ba296ab1eaeab5ab68c596f7723932788749c9c6 (patch) | |
| tree | aedd7608058c10eee77924dee98edc45a57e2719 /package/lua/lua.mk | |
| parent | 93341046d8e25ee6f135a34a8989598de22e32ca (diff) | |
| download | buildroot-ba296ab1eaeab5ab68c596f7723932788749c9c6.tar.gz buildroot-ba296ab1eaeab5ab68c596f7723932788749c9c6.zip | |
lua: choice between 5.1.x & 5.2.x
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/lua/lua.mk')
| -rw-r--r-- | package/lua/lua.mk | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/package/lua/lua.mk b/package/lua/lua.mk index a88a11ec9d..2c867f6e1e 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -4,7 +4,11 @@ # ################################################################################ +ifeq ($(BR2_PACKAGE_LUA_5_2),y) +LUA_VERSION = 5.2.3 +else LUA_VERSION = 5.1.5 +endif LUA_SITE = http://www.lua.org/ftp LUA_INSTALL_STAGING = YES LUA_LICENSE = MIT @@ -13,6 +17,13 @@ LUA_LICENSE_FILES = COPYRIGHT LUA_CFLAGS = -Wall -fPIC LUA_MYLIBS += -ldl +ifeq ($(BR2_PACKAGE_LUA_5_2),y) +LUA_CFLAGS += -DLUA_COMPAT_ALL +ifneq ($(BR2_LARGEFILE),y) +LUA_CFLAGS += -D_FILE_OFFSET_BITS=32 +endif +endif + ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y) LUA_DEPENDENCIES = readline ncurses LUA_MYLIBS += -lreadline -lhistory -lncurses @@ -33,6 +44,10 @@ HOST_LUA_DEPENDENCIES = HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX HOST_LUA_MYLIBS = -ldl +ifeq ($(BR2_PACKAGE_LUA_5_2),y) +HOST_LUA_CFLAGS += -DLUA_COMPAT_ALL +endif + define LUA_BUILD_CMDS $(MAKE) \ CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \ @@ -70,7 +85,8 @@ define LUA_INSTALL_TARGET_CMDS $(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 + mkdir -p $(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER) + mkdir -p $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER) endef define HOST_LUA_INSTALL_CMDS |
