diff options
| author | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2023-10-20 12:50:34 +0200 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2023-10-24 22:58:59 +0200 |
| commit | f001951e3aec75bf750fda476c0ba4ce443029c3 (patch) | |
| tree | 3f498ed5b6772043675f1abb5eea084c19fe464d /LuaSocket/3.1.0 | |
| parent | 505c7012cb160690afdcf5e50a98970ad346cb1e (diff) | |
WIP prosodyprosody
Diffstat (limited to 'LuaSocket/3.1.0')
| -rw-r--r-- | LuaSocket/3.1.0/0001-src-makefile-Replace-.so-with-.a.patch | 133 | ||||
| -rw-r--r-- | LuaSocket/3.1.0/Dockerfile | 29 |
2 files changed, 162 insertions, 0 deletions
diff --git a/LuaSocket/3.1.0/0001-src-makefile-Replace-.so-with-.a.patch b/LuaSocket/3.1.0/0001-src-makefile-Replace-.so-with-.a.patch new file mode 100644 index 0000000..4120604 --- /dev/null +++ b/LuaSocket/3.1.0/0001-src-makefile-Replace-.so-with-.a.patch @@ -0,0 +1,133 @@ +From 744c5c50cfb4e782985f746c5821de6d05b9ece0 Mon Sep 17 00:00:00 2001 +From: Xavier Del Campo Romero <xavi.dcr@tutanota.com> +Date: Tue, 24 Oct 2023 21:39:44 +0200 +Subject: [PATCH] src/makefile: Replace .so with .a + +--- + src/makefile | 60 ++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 46 insertions(+), 14 deletions(-) + +diff --git a/src/makefile b/src/makefile +index 06f4d19..53d984b 100755 +--- a/src/makefile ++++ b/src/makefile +@@ -132,6 +132,7 @@ INSTALL_TOP=$(DESTDIR)$(prefix) + + INSTALL_TOP_LDIR=$(INSTALL_TOP)/$(LDIR) + INSTALL_TOP_CDIR=$(INSTALL_TOP)/$(CDIR) ++INSTALL_TOP_INCDIR=$(INSTALL_TOP)/$(INCDIR) + + INSTALL_SOCKET_LDIR=$(INSTALL_TOP_LDIR)/socket + INSTALL_SOCKET_CDIR=$(INSTALL_TOP_CDIR)/socket +@@ -170,6 +171,7 @@ SOCKET_macosx=usocket.o + #------ + # Compiler and linker settings + # for Linux ++A_linux=a + SO_linux=so + O_linux=o + CC_linux=gcc +@@ -270,13 +272,19 @@ SOCKET_win64=wsocket.obj + #------ + # Output file names + # ++# Packaging notes: library names were taken from Ubuntu APT. ++A=$(A_$(PLAT)) + SO=$(SO_$(PLAT)) + O=$(O_$(PLAT)) + SOCKET_V=3.0.0 + MIME_V=1.0.3 ++SOCKET_A=libluasocket.a + SOCKET_SO=socket-$(SOCKET_V).$(SO) ++MIME_A=libluamime.$(A) + MIME_SO=mime-$(MIME_V).$(SO) ++UNIX_A=libluaunix.$(A) + UNIX_SO=unix.$(SO) ++SERIAL_A=libluasocket-serial.$(A) + SERIAL_SO=serial.$(SO) + SOCKET=$(SOCKET_$(PLAT)) + +@@ -360,6 +368,28 @@ TO_TOP_LDIR= \ + socket.lua \ + mime.lua + ++TO_TOP_INCDIR = \ ++ auxiliar.h \ ++ buffer.h \ ++ compat.h \ ++ except.h \ ++ inet.h \ ++ io.h \ ++ luasocket.h \ ++ mime.h \ ++ options.h \ ++ pierror.h \ ++ select.h \ ++ socket.h \ ++ tcp.h \ ++ timeout.h \ ++ udp.h \ ++ unixdgram.h \ ++ unix.h \ ++ unixstream.h \ ++ usocket.h \ ++ wsocket.h ++ + #------ + # Targets + # +@@ -393,35 +423,37 @@ none: + @echo "where PLATFORM is one of these:" + @echo " $(PLATS)" + +-all: $(SOCKET_SO) $(MIME_SO) ++all: $(SOCKET_A) $(MIME_A) + +-$(SOCKET_SO): $(SOCKET_OBJS) +- $(LD) $(SOCKET_OBJS) $(LDFLAGS)$@ ++$(SOCKET_A): $(SOCKET_OBJS) ++ $(AR) $(ARFLAGS) $@ $(SOCKET_OBJS) + +-$(MIME_SO): $(MIME_OBJS) +- $(LD) $(MIME_OBJS) $(LDFLAGS)$@ ++$(MIME_A): $(MIME_OBJS) ++ $(AR) $(ARFLAGS) $@ $(MIME_OBJS) + +-all-unix: all $(UNIX_SO) $(SERIAL_SO) ++all-unix: all $(UNIX_A) $(SERIAL_A) + +-$(UNIX_SO): $(UNIX_OBJS) +- $(LD) $(UNIX_OBJS) $(LDFLAGS)$@ ++$(UNIX_A): $(UNIX_OBJS) ++ $(AR) $(ARFLAGS) $@ $(UNIX_OBJS) + +-$(SERIAL_SO): $(SERIAL_OBJS) +- $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ ++$(SERIAL_A): $(SERIAL_OBJS) ++ $(AR) $(ARFLAGS) $@ $(SERIAL_OBJS) + + install: ++ $(INSTALL_DIR) $(INSTALL_TOP_INCDIR) ++ $(INSTALL_DATA) $(TO_TOP_INCDIR) $(INSTALL_TOP_INCDIR) + $(INSTALL_DIR) $(INSTALL_TOP_LDIR) + $(INSTALL_DATA) $(TO_TOP_LDIR) $(INSTALL_TOP_LDIR) + $(INSTALL_DIR) $(INSTALL_SOCKET_LDIR) + $(INSTALL_DATA) $(TO_SOCKET_LDIR) $(INSTALL_SOCKET_LDIR) + $(INSTALL_DIR) $(INSTALL_SOCKET_CDIR) +- $(INSTALL_EXEC) $(SOCKET_SO) $(INSTALL_SOCKET_CDIR)/core.$(SO) ++ $(INSTALL_EXEC) $(SOCKET_A) $(INSTALL_SOCKET_CDIR)/ + $(INSTALL_DIR) $(INSTALL_MIME_CDIR) +- $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_CDIR)/core.$(SO) ++ $(INSTALL_EXEC) $(MIME_A) $(INSTALL_MIME_CDIR)/ + + install-unix: install +- $(INSTALL_EXEC) $(UNIX_SO) $(INSTALL_SOCKET_CDIR)/$(UNIX_SO) +- $(INSTALL_EXEC) $(SERIAL_SO) $(INSTALL_SOCKET_CDIR)/$(SERIAL_SO) ++ $(INSTALL_EXEC) $(UNIX_A) $(INSTALL_SOCKET_CDIR)/ ++ $(INSTALL_EXEC) $(SERIAL_A) $(INSTALL_SOCKET_CDIR)/ + + local: + $(MAKE) install INSTALL_TOP_CDIR=.. INSTALL_TOP_LDIR=.. +-- +2.34.1 + diff --git a/LuaSocket/3.1.0/Dockerfile b/LuaSocket/3.1.0/Dockerfile new file mode 100644 index 0000000..1be6721 --- /dev/null +++ b/LuaSocket/3.1.0/Dockerfile @@ -0,0 +1,29 @@ +FROM alpine +RUN apk update && apk add \ + make \ + gcc \ + git \ + musl-dev \ + wget +COPY --from=lua:5.4.6 /opt/spm/lua-5.4.6/ /usr/local/ +RUN wget https://github.com/lunarmodules/luasocket/archive/refs/tags/v3.1.0.tar.gz +RUN tar -xf v3.1.0.tar.gz +WORKDIR /luasocket-3.1.0 +RUN mkdir patches +COPY 0001-src-makefile-Replace-.so-with-.a.patch patches/ +RUN git apply patches/0001-src-makefile-Replace-.so-with-.a.patch +ARG PREFIX=/opt/spm/luasocket-3.1.0 +RUN make -j$(nproc --all) \ + LUAINC_linux=/usr/local/include \ + MYCFLAGS="-ffunction-sections -fdata-sections -Os" \ + LUAV=5.4 \ + LDFLAGS_linux= +RUN make install \ + LUAV=5.4 \ + INSTALL_MIME_CDIR=$PREFIX/lib \ + INSTALL_MIME_LDIR=$PREFIX/lib/mime \ + INSTALL_SOCKET_CDIR=$PREFIX/lib/ \ + INSTALL_SOCKET_LDIR=$PREFIX/lib/socket \ + INSTALL_TOP_LDIR=$PREFIX/lib \ + INSTALL_TOP_CDIR=$PREFIX/lib \ + INSTALL_TOP_INCDIR=$PREFIX/include/luasocket |
