From 965623800695be22a3a8cdb388cd96bd48405b93 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 14 Jul 2019 23:36:55 +0200 Subject: [PATCH] - align target-lua.mk to max_10 --- make/target-lua.mk | 89 ++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/make/target-lua.mk b/make/target-lua.mk index c6a71f38..05b24261 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -3,11 +3,14 @@ # # ----------------------------------------------------------------------------- -LUA_ABIVER = 5.2 -LUA_VER = $(LUA_ABIVER).4 +LUA_VER = 5.2.4 +LUA_ABIVER = $(basename $(LUA_VER)) +LUA = lua-$(LUA_VER) +LUA_SOURCE = lua-$(LUA_VER).tar.gz +LUA_URL = https://www.lua.org -$(ARCHIVE)/lua-$(LUA_VER).tar.gz: - $(DOWNLOAD) http://www.lua.org/ftp/lua-$(LUA_VER).tar.gz +$(ARCHIVE)/$(LUA_SOURCE): + $(DOWNLOAD) $(LUA_URL)/ftp/$(LUA_SOURCE) LUA_PATCH = lua-01-fix-LUA_ROOT.patch LUA_PATCH += lua-01-remove-readline.patch @@ -16,10 +19,10 @@ LUA_PATCH += lua-02-shared-libs-for-lua.patch LUA_PATCH += lua-03-lua-pc.patch LUA_PATCH += lua-04-crashfix.diff -$(D)/lua: $(D)/ncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGET_DIR) - $(REMOVE)/lua-$(LUA_VER) - $(UNTAR)/lua-$(LUA_VER).tar.gz - $(CHDIR)/lua-$(LUA_VER); \ +$(D)/lua: $(D)/ncurses $(ARCHIVE)/$(LUA_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(LUA) + $(UNTAR)/$(LUA_SOURCE) + $(CHDIR)/$(LUA); \ $(call apply_patches, $(LUA_PATCH)); \ sed -i 's/^V=.*/V= $(LUA_ABIVER)/' etc/lua.pc; \ sed -i 's/^R=.*/R= $(LUA_VER)/' etc/lua.pc; \ @@ -36,54 +39,59 @@ $(D)/lua: $(D)/ncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGET_DIR) install -D -m 0644 $(BUILD_TMP)/lua-$(LUA_VER)/etc/lua.pc $(PKG_CONFIG_PATH)/lua.pc $(REWRITE_PKGCONF)/lua.pc rm -rf $(TARGET_DIR)/bin/luac - $(REMOVE)/lua-$(LUA_VER) + $(REMOVE)/$(LUA) $(TOUCH) # ----------------------------------------------------------------------------- -LUAEXPAT_VER = 1.3.0 +LUAEXPAT_VER = 1.3.0 +LUAEXPAT = luaexpat-$(LUAEXPAT_VER) +LUAEXPAT_SOURCE = luaexpat-$(LUAEXPAT_VER).tar.gz +LUAEXPAT_URL = https://matthewwild.co.uk/projects/luaexpat -$(ARCHIVE)/luaexpat-$(LUAEXPAT_VER).tar.gz: - $(DOWNLOAD) http://matthewwild.co.uk/projects/luaexpat/luaexpat-$(LUAEXPAT_VER).tar.gz +$(ARCHIVE)/$(LUAEXPAT_SOURCE): + $(DOWNLOAD) $(LUAEXPAT_URL)/$(LUAEXPAT_SOURCE) LUAEXPAT_PATCH = luaexpat-makefile.patch -$(D)/luaexpat: $(D)/expat $(D)/lua $(ARCHIVE)/luaexpat-$(LUAEXPAT_VER).tar.gz | $(TARGET_DIR) - $(REMOVE)/luaexpat-$(LUAEXPAT_VER) - $(UNTAR)/luaexpat-$(LUAEXPAT_VER).tar.gz - $(CHDIR)/luaexpat-$(LUAEXPAT_VER); \ +$(D)/luaexpat: $(D)/expat $(D)/lua $(ARCHIVE)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(LUAEXPAT) + $(UNTAR)/$(LUAEXPAT_SOURCE) + $(CHDIR)/$(LUAEXPAT); \ $(call apply_patches, $(LUAEXPAT_PATCH)); \ $(BUILDENV) \ $(MAKE) \ PREFIX=$(TARGET_DIR); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/luaexpat-$(LUAEXPAT_VER) + $(REMOVE)/$(LUAEXPAT) $(TOUCH) # ----------------------------------------------------------------------------- -LUA-FEEDPARSER_VER = 0.71 +LUA-FEEDPARSER_VER = 0.71 +LUA-FEEDPARSER = lua-feedparser-$(LUA-FEEDPARSER_VER) LUA-FEEDPARSER_SOURCE = lua-feedparser-$(LUA-FEEDPARSER_VER).tar.gz +LUA-FEEDPARSER_URL = https://github.com/slact/lua-feedparser/archive $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE): - $(DOWNLOAD) https://github.com/slact/lua-feedparser/archive/$(LUA-FEEDPARSER_VER).tar.gz -O $@ + $(DOWNLOAD) $(LUA-FEEDPARSER_URL)/$(LUA-FEEDPARSER_SOURCE) -O $@ LUA-FEEDPARSER_PATCH = lua-feedparser.patch $(D)/lua-feedparser: $(D)/luaexpat $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR) - $(REMOVE)/lua-feedparser-$(LUA-FEEDPARSER_VER) + $(REMOVE)/$(LUA-FEEDPARSER) $(UNTAR)/$(LUA-FEEDPARSER_SOURCE) - $(CHDIR)/lua-feedparser-$(LUA-FEEDPARSER_VER); \ + $(CHDIR)/$(LUA-FEEDPARSER); \ sed -i 's|^PREFIX =|PREFIX ?=|' Makefile; \ $(call apply_patches, $(LUA-FEEDPARSER_PATCH)); \ $(MAKE) install PREFIX=$(TARGET_DIR) - $(REMOVE)/lua-feedparser-$(LUA-FEEDPARSER_VER) + $(REMOVE)/$(LUA-FEEDPARSER) $(TOUCH) # ----------------------------------------------------------------------------- LUAJSON_SOURCE = JSON.lua -LUAJSON_URL = http://regex.info/code/$(LUAJSON_SOURCE) +LUAJSON_URL = http://regex.info/code/$(LUAJSON_SOURCE) $(ARCHIVE)/$(LUAJSON_SOURCE): $(DOWNLOAD) $(LUAJSON_URL) @@ -97,15 +105,16 @@ $(D)/luajson: $(ARCHIVE)/$(LUAJSON_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- -LUACURL_VER = git +LUACURL_VER = git +LUACURL = lua-curlv3.$(LUACURL_VER) LUACURL_SOURCE = lua-curlv3.$(LUACURL_VER) -LUACURL_URL = https://github.com/lua-curl/$(LUACURL_SOURCE) +LUACURL_URL = https://github.com/lua-curl/$(LUACURL_SOURCE) $(D)/luacurl: $(D)/libcurl $(D)/lua | $(TARGET_DIR) - $(REMOVE)/$(LUACURL_SOURCE) + $(REMOVE)/$(LUACURL) get-git-source.sh $(LUACURL_URL) $(ARCHIVE)/$(LUACURL_SOURCE) - $(CPDIR)/$(LUACURL_SOURCE) - $(CHDIR)/$(LUACURL_SOURCE); \ + $(CPDIR)/$(LUACURL) + $(CHDIR)/$(LUACURL); \ $(BUILDENV) \ $(MAKE) \ LIBDIR=$(TARGET_LIB_DIR) \ @@ -113,36 +122,40 @@ $(D)/luacurl: $(D)/libcurl $(D)/lua | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) \ LUA_CMOD=/lib/lua/$(LUA_ABIVER) \ LUA_LMOD=/share/lua/$(LUA_ABIVER) - $(REMOVE)/$(LUACURL_SOURCE) + $(REMOVE)/$(LUACURL) $(TOUCH) # ----------------------------------------------------------------------------- -LUAPOSIX_VER = 31 +LUAPOSIX_VER = 31 +LUAPOSIX = luaposix-$(LUAPOSIX_VER) LUAPOSIX_SOURCE = luaposix-$(LUAPOSIX_VER).tar.gz +LUAPOSIX_URL = https://github.com/luaposix/luaposix/archive $(ARCHIVE)/$(LUAPOSIX_SOURCE): - $(DOWNLOAD) https://github.com/luaposix/luaposix/archive/v$(LUAPOSIX_VER).tar.gz -O $@ + $(DOWNLOAD) $(LUAPOSIX_URL)/v$(LUAPOSIX_VER).tar.gz -O $@ LUAPOSIX_PATCH = luaposix-fix-build.patch LUAPOSIX_PATCH += luaposix-fix-docdir-build.patch -GNULIB_VER = 20140202 +GNULIB_VER = 20140202 GNULIB_SOURCE = gnulib-$(GNULIB_VER)-stable.tar.gz +GNULIB_URL = http://erislabs.net/ianb/projects/gnulib $(ARCHIVE)/$(GNULIB_SOURCE): - $(DOWNLOAD) http://erislabs.net/ianb/projects/gnulib/$(GNULIB_SOURCE) + $(DOWNLOAD) $(GNULIB_URL)/$(GNULIB_SOURCE) -SLINGSHOT_VER = 6 +SLINGSHOT_VER = 6 SLINGSHOT_SOURCE = slingshot-$(SLINGSHOT_VER).tar.gz +SLINGSHOT_URL = https://github.com/gvvaughan/slingshot/archive $(ARCHIVE)/$(SLINGSHOT_SOURCE): - $(DOWNLOAD) https://github.com/gvvaughan/slingshot/archive/v$(SLINGSHOT_VER).tar.gz -O $@ + $(DOWNLOAD) $(SLINGSHOT_URL)/v$(SLINGSHOT_VER).tar.gz -O $@ $(D)/luaposix: $(HOST_LUA) $(D)/lua $(D)/luaexpat $(ARCHIVE)/$(SLINGSHOT_SOURCE) $(ARCHIVE)/$(GNULIB_SOURCE) $(ARCHIVE)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR) - $(REMOVE)/luaposix-$(LUAPOSIX_VER) + $(REMOVE)/$(LUAPOSIX) $(UNTAR)/$(LUAPOSIX_SOURCE) - $(CHDIR)/luaposix-$(LUAPOSIX_VER); \ + $(CHDIR)/$(LUAPOSIX); \ tar -C gnulib --strip=1 -xf $(ARCHIVE)/$(GNULIB_SOURCE); \ tar -C slingshot --strip=1 -xf $(ARCHIVE)/$(SLINGSHOT_SOURCE); \ $(call apply_patches, $(LUAPOSIX_PATCH)); \ @@ -160,5 +173,5 @@ $(D)/luaposix: $(HOST_LUA) $(D)/lua $(D)/luaexpat $(ARCHIVE)/$(SLINGSHOT_SOURCE) ; \ $(MAKE); \ $(MAKE) all check install - $(REMOVE)/luaposix-$(LUAPOSIX_VER) + $(REMOVE)/$(LUAPOSIX) $(TOUCH)