bump version lua-5.2.4; fix target

diff --git a/make/archives.mk b/make/archives.mk
index 880291a367d5762e18ef3644d132d1b0214482b9..cbfe70fb0366e29fb4ba8ce1bcfeed5eaf3c75e0 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -216,8 +216,8 @@ $(ARCHIVE)/luasocket-master.zip:
        $(WGET) https://github.com/diegonehab/luasocket/archive/master.zip
        mv $(ARCHIVE)/master.zip $(ARCHIVE)/luasocket-master.zip
 
-$(ARCHIVE)/lua-5.2.3.tar.gz:
-       $(WGET) http://www.fhloston-paradise.de/lua-5.2.3.tar.gz
+$(ARCHIVE)/lua-$(LUA_VER).tar.gz:
+       $(WGET) http://www.lua.org/ftp/lua-$(LUA_VER).tar.gz
 
 $(ARCHIVE)/luaposix-31.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/luaposix-31.tar.gz

diff --git a/make/libraries.mk b/make/libraries.mk
index 1782cee36e5c244774f56d771831cf2b9220b04a..10fb7597759fe10d2beda8364bdbb2ac87dcb666 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -841,6 +841,8 @@ $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
                $(PATCH)/lua-02-shared-libs-for-lua.patch; \
                $(PATCH)/lua-03-lua-pc.patch; \
                $(PATCH)/lua-04-lua-lvm.c.patch; \
+               sed -i 's/^V=.*/V= $(LUA_ABIVER)/' etc/lua.pc && \
+               sed -i 's/^R=.*/R= $(LUA_VER)/' etc/lua.pc; \
                $(MAKE) linux PKG_VERSION=$(LUA_VER) CC=$(TARGET)-gcc LD=$(TARGET)-ld AR="$(TARGET)-ar rcu" RANLIB=$(TARGET)-ranlib LDFLAGS="-L$(TARGETPREFIX)/lib"; \
                $(MAKE) install INSTALL_TOP=$(TARGETPREFIX)
        install -m 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/liblua.so.$(LUA_VER) $(TARGETPREFIX)/lib/liblua.so.$(LUA_VER)

diff --git a/make/versions.mk b/make/versions.mk
index 73c2a435a4e2b74b716ceab6f6d12edff243ed48..3cfefc9a9d40118935a7214d7384300c44e97135 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -83,7 +83,7 @@ LIBXML2_VER = 2.9.3
 
 # lua: easily embeddable scripting language
 LUA_ABIVER = 5.2
-LUA_VER=$(LUA_ABIVER).3
+LUA_VER=$(LUA_ABIVER).4
 
 LUACURL_VER=v3