From: Markham Date: Sun, 9 Apr 2017 17:14:36 +0000 (+0200) Subject: bump version lua-5.2.4; fix target X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=fca92e594876b4d91e1740efdfedf308aab2b048;p=bs-cst-neutrino-hd.git bump version lua-5.2.4; fix target --- diff --git a/make/archives.mk b/make/archives.mk index 880291a..cbfe70f 100755 --- 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 1782cee..10fb759 100755 --- 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 73c2a43..3cfefc9 100644 --- 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