fix target luasocket; use always newest git

diff --git a/make/archives.mk b/make/archives.mk
index cbfe70fb0366e29fb4ba8ce1bcfeed5eaf3c75e0..94339aca990a5b47a570f9f6e13422d53926bf57 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -212,10 +212,6 @@ $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz:
 $(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)
 
-$(ARCHIVE)/luasocket-master.zip:
-       $(WGET) https://github.com/diegonehab/luasocket/archive/master.zip
-       mv $(ARCHIVE)/master.zip $(ARCHIVE)/luasocket-master.zip
-
 $(ARCHIVE)/lua-$(LUA_VER).tar.gz:
        $(WGET) http://www.lua.org/ftp/lua-$(LUA_VER).tar.gz
 

diff --git a/make/libraries.mk b/make/libraries.mk
index 10fb7597759fe10d2beda8364bdbb2ac87dcb666..bd7ac2767de636b1fc2b10990403af6cc3772c1e 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -767,10 +767,10 @@ $(D)/lua-feedparser: $(ARCHIVE)/lua-feedparser-$(LUA_FEEDPARSER_VER).tar.bz2 $(D
        $(REMOVE)/lua-feedparser-$(LUA_FEEDPARSER_VER)
        touch $@
 
-$(D)/lua-socket: $(ARCHIVE)/luasocket-master.zip | $(TARGETPREFIX)
-       cd $(BUILD_TMP); \
-               unzip -q $(ARCHIVE)/luasocket-master.zip
-       set -e; cd $(BUILD_TMP)/luasocket-master; \
+$(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; \
                patch -p1 < $(PATCHES)/luasocket-makefile.patch; \
                $(MAKE) \
                CC=$(TARGET)-gcc LD_linux=$(TARGET)-gcc LUAV=$(LUA_ABIVER) PLAT=linux COMPAT=COMPAT \
@@ -778,10 +778,7 @@ $(D)/lua-socket: $(ARCHIVE)/luasocket-master.zip | $(TARGETPREFIX)
                $(MAKE) install \
                LUAV=$(LUA_ABIVER) LUAPREFIX_linux= \
                CDIR_linux=$(TARGETPREFIX)/lib/lua/$(LUA_ABIVER) LDIR_linux=$(TARGETPREFIX)/share/lua/$(LUA_ABIVER); \
-       mkdir -p $(TARGETPREFIX)/share/doc/lua/lua-socket
-       cp -a $(BUILD_TMP)/luasocket-master/samples $(TARGETPREFIX)/share/doc/lua/lua-socket
-       cp -a $(BUILD_TMP)/luasocket-master/test $(TARGETPREFIX)/share/doc/lua/lua-socket
-       rm -fr $(BUILD_TMP)/luasocket-master
+       rm -fr $(BUILD_TMP)/luasocket
        touch $@
 
 $(D)/luacurl: $(D)/libcurl $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz | $(TARGETPREFIX)