vlc | branch: master | Hugo Beauzée-Luyssen <h...@beauzee.fr> | Tue Jan 15 11:48:32 2019 +0100| [db1d637fce6731fad870304e8e2d309f9781b268] | committer: Hugo Beauzée-Luyssen
contrib: upnp: Force -lpthread into libupnp.pc This is a partial revert (with modifications) of 1d156f093dbeca94a20c7355708e2f7bdce586b4 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=db1d637fce6731fad870304e8e2d309f9781b268 --- contrib/src/upnp/libupnp-pthread-w32-force.patch | 10 ++++++++++ contrib/src/upnp/rules.mak | 1 + 2 files changed, 11 insertions(+) diff --git a/contrib/src/upnp/libupnp-pthread-w32-force.patch b/contrib/src/upnp/libupnp-pthread-w32-force.patch new file mode 100644 index 0000000000..bbfd3c9400 --- /dev/null +++ b/contrib/src/upnp/libupnp-pthread-w32-force.patch @@ -0,0 +1,10 @@ +--- upnp/configure.ac.pthread-w32 2018-05-17 11:51:47.115502500 +0200 ++++ upnp/configure.ac 2018-05-17 12:49:30.371786100 +0200 +@@ -667,6 +667,7 @@ ACX_PTHREAD( + # + # Update environment variables for pthreads + # ++PTHREAD_LIBS="-lpthread" + CC="$PTHREAD_CC" + CFLAGS="$PTHREAD_CFLAGS $CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak index a911c1896b..85df0b6ea3 100644 --- a/contrib/src/upnp/rules.mak +++ b/contrib/src/upnp/rules.mak @@ -34,6 +34,7 @@ ifdef HAVE_WIN32 $(APPLY) $(SRC)/upnp/windows-version-inet.patch $(APPLY) $(SRC)/upnp/libupnp-win32-exports.patch $(APPLY) $(SRC)/upnp/libupnp-pthread-w32-checks.patch + $(APPLY) $(SRC)/upnp/libupnp-pthread-w32-force.patch ifdef HAVE_WINSTORE $(APPLY) $(SRC)/upnp/no-getifinfo.patch endif _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
