From 09e39eb8ac13007991b97ec997a470d1fe1705d1 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 22 Dec 2019 17:52:38 +0100 Subject: [PATCH] bump version lua-expat-1.3.3; change source url --- make/archives.mk | 4 ++-- make/libraries.mk | 14 ++++++++------ make/versions.mk | 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/make/archives.mk b/make/archives.mk index 1fdb250..7f1ae03 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -303,8 +303,8 @@ $(ARCHIVE)/ethtool-$(ETHTOOL_VER).tar.xz: $(ARCHIVE)/expat-$(EXPAT_VER).tar.bz2: $(WGET) http://downloads.sourceforge.net/expat/expat-$(EXPAT_VER).tar.bz2 -$(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz: - $(WGET) http://matthewwild.co.uk/projects/luaexpat/luaexpat-$(LUA_EXPAT_VER).tar.gz +$(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.bz2: + get-git-archive.sh https://github.com/tomasguisasola/luaexpat.git $(LUA_EXPAT_GIT) $(notdir $@) $(ARCHIVE) $(ARCHIVE)/lua-feedparser-$(LUA_FEEDPARSER_VER).tar.bz2: | $(HOSTPREFIX)/bin/get-git-archive.sh get-git-archive.sh https://github.com/slact/lua-feedparser.git $(LUA_FEEDPARSER_TAG) $(notdir $@) $(ARCHIVE) diff --git a/make/libraries.mk b/make/libraries.mk index 5befa4e..0a79e33 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -990,15 +990,17 @@ $(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.bz2 | $(TARGETPREFIX) $(REMOVE)/expat-$(EXPAT_VER) $(TOUCH) -$(D)/lua-expat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGETPREFIX) +$(D)/lua-expat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.bz2 $(D)/expat | $(TARGETPREFIX) $(START_BUILD) - $(UNTAR)/luaexpat-$(LUA_EXPAT_VER).tar.gz + $(REMOVE)/luaexpat-$(LUA_EXPAT_VER) + $(UNTAR)/luaexpat-$(LUA_EXPAT_VER).tar.bz2 set -e; cd $(BUILD_TMP)/luaexpat-$(LUA_EXPAT_VER); \ - rm makefile*; \ + rm makefile.win; \ + sed -i -e "s/^EXPAT_INC=/EXPAT_INC ?=/" makefile ; \ $(MAKE) \ - CC=$(TARGET)-gcc LUA_V=$(LUA_ABIVER) LDFLAGS=-L$(TARGETPREFIX)/lib \ - LUA_INC=-I$(TARGETPREFIX)/include EXPAT_INC=-I$(TARGETPREFIX)/include; \ - $(MAKE) install LUA_LDIR=$(TARGETPREFIX)/share/lua/$(LUA_ABIVER) LUA_CDIR=$(TARGETPREFIX)/lib/lua/$(LUA_ABIVER) + CC=$(TARGET)-gcc LUA_SYS_VER=$(LUA_ABIVER) LIB_OPTION="-shared -L$(TARGETPREFIX)/lib" \ + LUA_INC=$(TARGETPREFIX)/include EXPAT_INC=$(TARGETPREFIX)/include; \ + $(MAKE) install LUA_DIR=$(TARGETPREFIX)/share/lua/$(LUA_ABIVER) LUA_LIBDIR=$(TARGETPREFIX)/lib/lua/$(LUA_ABIVER) rm -fr $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)/lxp/tests $(REMOVE)/luaexpat-$(LUA_EXPAT_VER) $(TOUCH) diff --git a/make/versions.mk b/make/versions.mk index 355b1ae..64eef36 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -161,7 +161,8 @@ LUA_VER=$(LUA_ABIVER).4 LUACURL_VER = v3 LUACURL_GIT = cb29348 -LUA_EXPAT_VER = 1.3.0 +LUA_EXPAT_VER = 1.3.3 +LUA_EXPAT_GIT = 9878960 # lua-feedparser LUA_FEEDPARSER_VER=0.71 -- 2.39.5