From b7e51b3c1ad06661b66538e1cc9d1d5aa16b9719 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 15 Jun 2019 00:28:49 +0200
Subject: [PATCH] - system-lua: update several builds

---
 archive-patches/lua-03-lua-pc.patch |  6 +++---
 make/system-lua.mk                  | 20 +++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/archive-patches/lua-03-lua-pc.patch b/archive-patches/lua-03-lua-pc.patch
index 452c8521..4c3d0a34 100644
--- a/archive-patches/lua-03-lua-pc.patch
+++ b/archive-patches/lua-03-lua-pc.patch
@@ -12,16 +12,16 @@ Index: b/etc/lua.pc
 +# vars from install Makefile
 +
 +# grep '^V=' ../Makefile
-+V= 5.2
++V=5.2
 +# grep '^R=' ../Makefile
-+R= 5.2.1
++R=5.2.4
 +
 +# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
 +prefix= /
 +INSTALL_BIN= ${prefix}/bin
 +INSTALL_INC= ${prefix}/include
 +INSTALL_LIB= ${prefix}/lib
-+INSTALL_MAN= ${prefix}/man/man1
++INSTALL_MAN= ${prefix}/.remove
 +INSTALL_LMOD= ${prefix}/share/lua/${V}
 +INSTALL_CMOD= ${prefix}/lib/lua/${V}
 +
diff --git a/make/system-lua.mk b/make/system-lua.mk
index 09b1ec3f..70e66745 100644
--- a/make/system-lua.mk
+++ b/make/system-lua.mk
@@ -21,7 +21,13 @@ $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGET_DIR)
 		$(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; \
-		$(MAKE) linux PKG_VERSION=$(LUA_VER) CC=$(TARGET)-gcc LD=$(TARGET)-ld AR="$(TARGET)-ar rcu" RANLIB=$(TARGET)-ranlib LDFLAGS="$(TARGET_LDFLAGS)"; \
+		$(MAKE) linux \
+			PKG_VERSION=$(LUA_VER) \
+			CC="$(TARGET)-gcc" \
+			LD="$(TARGET)-ld" \
+			AR="$(TARGET)-ar rcu" \
+			RANLIB=$(TARGET)-ranlib \
+			LDFLAGS="$(TARGET_LDFLAGS)"; \
 		$(MAKE) install INSTALL_TOP=$(TARGET_DIR)
 	install -D -m 0755 $(BUILD_TMP)/lua-$(LUA_VER)/src/liblua.so.$(LUA_VER) $(TARGET_LIB_DIR)/liblua.so.$(LUA_VER)
 	ln -sf liblua.so.$(LUA_VER) $(TARGET_LIB_DIR)/liblua.so
@@ -45,7 +51,9 @@ $(D)/luaexpat: $(D)/expat $(D)/lua $(ARCHIVE)/luaexpat-$(LUAEXPAT_VER).tar.gz |
 	$(UNTAR)/luaexpat-$(LUAEXPAT_VER).tar.gz
 	$(CHDIR)/luaexpat-$(LUAEXPAT_VER); \
 		$(call apply_patches, $(LUAEXPAT_PATCH)); \
-		$(MAKE) CC=$(TARGET)-gcc LDFLAGS="$(TARGET_LDFLAGS)" PREFIX=$(TARGET_DIR); \
+		$(BUILDENV) \
+		$(MAKE) \
+			PREFIX=$(TARGET_DIR); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REMOVE)/luaexpat-$(LUAEXPAT_VER)
 	$(TOUCH)
@@ -56,7 +64,7 @@ LUA-FEEDPARSER_VER = 0.71
 LUA-FEEDPARSER_SOURCE = lua-feedparser-$(LUA-FEEDPARSER_VER).tar.gz
 
 $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE):
-	$(WGET) https://github.com/slact/lua-feedparser/archive/$(LUA-FEEDPARSER_VER).tar.gz -O $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE)
+	$(WGET) https://github.com/slact/lua-feedparser/archive/$(LUA-FEEDPARSER_VER).tar.gz -O $@
 
 LUA-FEEDPARSER_PATCH  = lua-feedparser.patch
 
@@ -96,8 +104,7 @@ $(D)/luacurl: $(D)/libcurl $(D)/lua | $(TARGET_DIR)
 	$(CPDIR)/$(LUACURL_SOURCE)
 	$(CHDIR)/$(LUACURL_SOURCE); \
 		$(BUILDENV) \
-		$(MAKE) CC=$(TARGET)-gcc \
-			LDFLAGS="$(TARGET_LDFLAGS)" \
+		$(MAKE) \
 			LIBDIR=$(TARGET_LIB_DIR) \
 			LUA_INC=$(TARGET_INCLUDE_DIR); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR) \
@@ -119,9 +126,8 @@ $(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/
 	$(REMOVE)/luaposix-$(LUAPOSIX_VER)
 	$(UNTAR)/$(LUAPOSIX_SOURCE)
 	$(CHDIR)/luaposix-$(LUAPOSIX_VER); \
+		$(BUILDENV) \
 		$(HOST_DIR)/bin/lua-$(LUA_VER) build-aux/luke \
-			CC="$(TARGET)-gcc" \
-			CFLAGS="$(TARGET_CFLAGS)" \
 			LUA_INCDIR=$(TARGET_INCLUDE_DIR); \
 		$(HOST_DIR)/bin/lua-$(LUA_VER) build-aux/luke install \
 			INST_LIBDIR="$(TARGET_LIB_DIR)/lua/$(LUA_ABIVER)" \