fix target luasocket

diff --git a/make/archives.mk b/make/archives.mk
index ee21b8ba558b293eb144b174e23e0dd37d16ea8c..606405f4bc056253d2d263eb99d0126b18cbb42b 100755 (executable)
--- 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 39ed225f0741e467556c832837064c337c1f3274..17ac59bed51965b80b462e647e7caedf5b79a01c 100755 (executable)
--- 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 766364eb59df444df06739e25e63636d6c42992e..4bab7a6a9e596280ffe8a50f30a0876d56e59f0f 100644 (file)
--- 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