From 4ce7ef4d5705fbb721d11d89a30072c2a199b1ba Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sun, 21 May 2017 14:42:14 +0200
Subject: [PATCH] fix target luasocket

---
 make/archives.mk  |  3 +++
 make/libraries.mk | 11 +++++------
 make/versions.mk  |  3 +++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/make/archives.mk b/make/archives.mk
index ee21b8b..606405f 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -231,6 +231,9 @@ $(ARCHIVE)/luaposix-31.tar.gz:
 $(ARCHIVE)/Lua-cURL$(LUACURL_VER)-git-$(LUACURL_GIT).tar.bz2:
 	get-git-archive.sh https://github.com/Lua-cURL/Lua-cURLv3.git $(LUACURL_GIT) $(notdir $@) $(ARCHIVE)
 
+$(ARCHIVE)/Luasocket-$(LUASOCKET_VER)-git-$(LUASOCKET_GIT).tar.bz2:
+	get-git-archive.sh https://github.com/diegonehab/luasocket.git $(LUASOCKET_GIT) $(notdir $@) $(ARCHIVE)
+
 $(ARCHIVE)/slingshot-v6.tar.gz:
 	$(WGET) http://www.fhloston-paradise.de/slingshot-v6.tar.gz
 
diff --git a/make/libraries.mk b/make/libraries.mk
index 39ed225..17ac59b 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -787,7 +787,7 @@ $(D)/lua-expat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGE
 	rm -fr $(BUILD_TMP)/luaexpat-$(LUA_EXPAT_VER)
 	touch $@
 
-$(D)/lua-feedparser: $(ARCHIVE)/lua-feedparser-$(LUA_FEEDPARSER_VER).tar.bz2 $(D)/lua $(D)/lua-socket $(D)/lua-expat | $(TARGETPREFIX)
+$(D)/lua-feedparser: $(ARCHIVE)/lua-feedparser-$(LUA_FEEDPARSER_VER).tar.bz2 $(D)/lua $(D)/luasocket $(D)/lua-expat | $(TARGETPREFIX)
 	$(REMOVE)/lua-feedparser-$(LUA_FEEDPARSER_VER)
 	$(UNTAR)/lua-feedparser-$(LUA_FEEDPARSER_VER).tar.bz2; \
 	set -e; cd $(BUILD_TMP)/lua-feedparser-$(LUA_FEEDPARSER_VER); \
@@ -797,10 +797,9 @@ $(D)/lua-feedparser: $(ARCHIVE)/lua-feedparser-$(LUA_FEEDPARSER_VER).tar.bz2 $(D
 	$(REMOVE)/lua-feedparser-$(LUA_FEEDPARSER_VER)
 	touch $@
 
-$(D)/lua-socket: $(D)/lua | $(TARGETPREFIX)
-	set -e; cd $(BUILD_TMP); \
-		git clone git://github.com/diegonehab/luasocket.git luasocket; \
-	set -e; cd $(BUILD_TMP)/luasocket; \
+$(D)/luasocket: $(ARCHIVE)/Luasocket-$(LUASOCKET_VER)-git-$(LUASOCKET_GIT).tar.bz2 $(D)/lua | $(TARGETPREFIX)
+	$(UNTAR)/Luasocket-$(LUASOCKET_VER)-git-$(LUASOCKET_GIT).tar.bz2
+	set -e; cd $(BUILD_TMP)/Luasocket-$(LUASOCKET_VER)-git-$(LUASOCKET_GIT); \
 		patch -p1 < $(PATCHES)/luasocket-makefile.patch; \
 		$(MAKE) \
 		CC=$(TARGET)-gcc LD_linux=$(TARGET)-gcc LUAV=$(LUA_ABIVER) PLAT=linux COMPAT=COMPAT \
@@ -808,7 +807,7 @@ $(D)/lua-socket: $(D)/lua | $(TARGETPREFIX)
 		$(MAKE) install \
 		LUAV=$(LUA_ABIVER) LUAPREFIX_linux= \
 		CDIR_linux=$(TARGETPREFIX)/lib/lua/$(LUA_ABIVER) LDIR_linux=$(TARGETPREFIX)/share/lua/$(LUA_ABIVER); \
-	rm -fr $(BUILD_TMP)/luasocket
+	rm -fr $(BUILD_TMP)/Luasocket-$(LUASOCKET_VER)-git-$(LUASOCKET_GIT)
 	touch $@
 
 $(D)/luacurl: $(D)/libcurl $(ARCHIVE)/Lua-cURL$(LUACURL_VER)-git-$(LUACURL_GIT).tar.bz2 | $(TARGETPREFIX)
diff --git a/make/versions.mk b/make/versions.mk
index 766364e..4bab7a6 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -100,6 +100,9 @@ LUA_EXPAT_VER = 1.3.0
 LUA_FEEDPARSER_VER=0.71
 LUA_FEEDPARSER_TAG=9b284bc
 
+LUASOCKET_VER = 2.0.2
+LUASOCKET_GIT = 5a17f79
+
 # mtd-utils for the host...
 MTD_UTILS_VER = 1.5.2
 
-- 
2.39.5