add target lua-socket

diff --git a/archive-patches/luasocket-makefile.patch b/archive-patches/luasocket-makefile.patch
new file mode 100644 (file)
index 0000000..64b250e
--- /dev/null
+++ b/archive-patches/luasocket-makefile.patch
@@ -0,0 +1,17 @@
+--- a/src/makefile
++++ b/src/makefile
+@@ -160,10 +160,10 @@ DEF_linux=-DLUASOCKET_$(DEBUG) \
+       -DLUASOCKET_API='__attribute__((visibility("default")))' \
+       -DUNIX_API='__attribute__((visibility("default")))' \
+       -DMIME_API='__attribute__((visibility("default")))'
+-CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
+-      -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
+-LDFLAGS_linux=-O -shared -fpic -o 
+-LD_linux=gcc
++CFLAGS_linux= -I$(LUAINC) $(DEF) $(OPTFLAGS) \
++      -fvisibility=hidden -fPIC
++LDFLAGS_linux=$(OPTFLAGS) -shared -o
++LD_linux?=gcc
+ SOCKET_linux=usocket.o
+ 
+ #------

diff --git a/make/archives.mk b/make/archives.mk
index 27feffdbb21712e6219e1fe3a6d2e40f50d36889..843aa42cd063be8c03e33e003723062f3761fe10 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -171,6 +171,10 @@ $(ARCHIVE)/expat-$(EXPAT_VER).tar.gz:
 $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz:
        $(WGET) http://matthewwild.co.uk/projects/luaexpat/luaexpat-$(LUA_EXPAT_VER).tar.gz
 
+$(ARCHIVE)/luasocket-master.zip:
+       $(WGET) https://github.com/diegonehab/luasocket/archive/master.zip
+       mv $(ARCHIVE)/master.zip $(ARCHIVE)/luasocket-master.zip
+
 $(ARCHIVE)/lua-5.2.3.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/lua-5.2.3.tar.gz
 

diff --git a/make/libraries.mk b/make/libraries.mk
index 41c54298909c90fb621c81a3e1a4554575103f16..a0e142c2074b2c7405ac0075479ea54bfae5ef5d 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -632,7 +632,6 @@ $(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.gz | $(TARGETPREFIX)
        touch $@
 
 $(D)/lua-expat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGETPREFIX)
-       rm -fr $(BUILD_TMP)/luaexpat-$(LUA_EXPAT_VER)
        $(UNTAR)/luaexpat-$(LUA_EXPAT_VER).tar.gz
        set -e; cd $(BUILD_TMP)/luaexpat-$(LUA_EXPAT_VER); \
                rm makefile*; \
@@ -647,6 +646,23 @@ $(D)/lua-expat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGE
        rm -fr $(BUILD_TMP)/luaexpat-$(LUA_EXPAT_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; \
+               patch -p1 < $(PATCHES)/luasocket-makefile.patch; \
+               $(MAKE) \
+               CC=$(TARGET)-gcc LD_linux=$(TARGET)-gcc LUAV=$(LUA_ABIVER) PLAT=linux COMPAT=COMPAT \
+               LUAINC_linux=$(TARGETPREFIX)/include LUALIB_linux=$(TARGETPREFIX)/lib LUAPREFIX_linux=; \
+               $(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
+       touch $@
+
 $(D)/luacurl: $(D)/libcurl $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz | $(TARGETPREFIX)
        $(UNTAR)/Lua-cURL$(LUACURL_VER).tar.xz
        set -e; cd $(BUILD_TMP)/Lua-cURL$(LUACURL_VER); \