vlc | branch: master | Martin Storsjö <[email protected]> | Mon Feb 26 11:31:46 2018 +0200| [28a96b9b5e46e33239b19b9d067387588266c4b0] | committer: Martin Storsjö
contrib: live555: Don't try to use $(LD) to create static libraries on MinGW, use $(AR) This fixes building with llvm-mingw. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=28a96b9b5e46e33239b19b9d067387588266c4b0 --- 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 b77d96ce73..3093dedec6 100644 --- a/contrib/src/live555/rules.mak +++ b/contrib/src/live555/rules.mak @@ -76,6 +76,8 @@ endif $(APPLY) $(SRC)/live555/add-pkgconfig-file.patch # Expose Server: $(APPLY) $(SRC)/live555/expose_server_string.patch + # Fix creating static libs on mingw + $(APPLY) $(SRC)/live555/mingw-static-libs.patch mv live.$(LIVE555_VERSION) $@ && touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
