[vlc-commits] contrib: live555: Don't try to use $(LD) to create static libraries on MinGW, use $(AR)

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Mon Feb 26 11:31:46 2018 +0200| [79a5586d76025f00304877e3a01e67d6f08fc464] | committer: Hugo Beauzée-Luyssen

contrib: live555: Don't try to use $(LD) to create static libraries on MinGW, use $(AR)

This fixes building with llvm-mingw.

(cherry picked from commit 28a96b9b5e46e33239b19b9d067387588266c4b0)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 contrib/src/live555/mingw-static-libs.patch | 14 ++++++++++++++
 contrib/src/live555/rules.mak               |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/contrib/src/live555/mingw-static-libs.patch b/contrib/src/live555/mingw-static-libs.patch
new file mode 100644
index 0000000000..b01dfcbda8
--- /dev/null
+++ b/contrib/src/live555/mingw-static-libs.patch
@@ -0,0 +1,14 @@
+diff -urN live555-orig/config.mingw live555/config.mingw
+--- live555-orig/config.mingw	2018-02-26 11:28:41.446443807 +0200
++++ live555/config.mingw	2018-02-26 11:29:02.453948892 +0200
+@@ -9,8 +9,8 @@
+ LINK =                 $(CXX) -o 
+ LINK_OPTS =            -L.
+ CONSOLE_LINK_OPTS =    $(LINK_OPTS)
+-LIBRARY_LINK =         $(LD) -o 
+-LIBRARY_LINK_OPTS =    $(LINK_OPTS) -r -Bstatic
++LIBRARY_LINK =         $(AR) cr 
++LIBRARY_LINK_OPTS =
+ LIB_SUFFIX =                   a
+ LIBS_FOR_CONSOLE_APPLICATION = -lws2_32
+ LIBS_FOR_GUI_APPLICATION = -lws2_32
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 9b275ec33b..e4ed5afb07 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -84,6 +84,8 @@ ifneq ($(LEGACY_NDK), 1)
 	$(APPLY) $(SRC)/live555/file-offset-bits-64.patch
 endif
 endif
+	# Fix creating static libs on mingw
+	$(APPLY) $(SRC)/live555/mingw-static-libs.patch
 
 	mv live.$(LIVE555_VERSION) $@ && touch $@