[vlc-commits] contrib: lua: respect LDFLAGS under mingw

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Apr 30 17:05:18 2020 +0200| [abb722a96574be1917397d5b3df7e5e3958c92b1] | committer: Steve Lhomme

contrib: lua: respect LDFLAGS under mingw

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=abb722a96574be1917397d5b3df7e5e3958c92b1
---

 contrib/src/lua/implib.patch | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/contrib/src/lua/implib.patch b/contrib/src/lua/implib.patch
index db37ffe3cf..bd49239777 100644
--- a/contrib/src/lua/implib.patch
+++ b/contrib/src/lua/implib.patch
@@ -1,7 +1,6 @@
-diff -urN lua-5.1.4-orig/src/Makefile lua-5.1.4/src/Makefile
---- lua-5.1.4-orig/src/Makefile	2017-12-14 07:30:51.879954115 +0000
-+++ lua-5.1.4/src/Makefile	2017-12-14 08:00:29.765126324 +0000
-@@ -23,6 +23,7 @@
+--- lua-5.1.4/src/Makefile.orig	2020-05-20 08:56:30.202417200 +0200
++++ lua-5.1.4/src/Makefile	2020-05-20 09:00:53.789157500 +0200
+@@ -23,6 +23,7 @@ MYLIBS=
  PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  
  LUA_A=	liblua.a
@@ -9,7 +8,7 @@ diff -urN lua-5.1.4-orig/src/Makefile lua-5.1.4/src/Makefile
  CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
  	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
  	lundump.o lvm.o lzio.o
-@@ -52,10 +53,10 @@
+@@ -52,10 +53,10 @@ $(LUA_A): $(CORE_O) $(LIB_O)
  	$(RANLIB) $@
  
  $(LUA_T): $(LUA_O) $(LUA_A)
@@ -22,14 +21,18 @@ diff -urN lua-5.1.4-orig/src/Makefile lua-5.1.4/src/Makefile
  
  clean:
  	$(RM) $(ALL_T) $(ALL_O)
-@@ -107,8 +108,8 @@
+@@ -107,10 +108,10 @@ macosx:
  #	$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
  
  mingw:
 -	$(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
 -	"AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
+-	"MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
+-	$(MAKE) "LUAC_T=luac.exe" luac.exe
 +	$(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" "LUA_A_LINK=lua51.lib" \
-+	"AR=$(CC) -shared -Wl,--out-implib,lua51.lib -o" "RANLIB=strip --strip-unneeded" \
- 	"MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
- 	$(MAKE) "LUAC_T=luac.exe" luac.exe
++	"AR=$(CC) -shared -Wl,--out-implib,lua51.lib  $(LDFLAGS) -o" "RANLIB=strip --strip-unneeded" \
++	"MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s $(LDFLAGS)" lua.exe
++	$(MAKE) "LUAC_T=luac.exe" "MYLDFLAGS=$(LDFLAGS)" luac.exe
  
+ posix:
+ 	$(MAKE) all MYCFLAGS=-DLUA_USE_POSIX