[vlc-commits] [Git][videolan/vlc][master] 3 commits: configure: add -pthread to CXXFLAGS when it's added to CFLAGS

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
e36c8e98 by Steve Lhomme at 2022-03-12T11:54:32+00:00
configure: add -pthread to CXXFLAGS when it's added to CFLAGS

- - - - -
0ff2236c by Steve Lhomme at 2022-03-12T11:54:32+00:00
decklink: don't force link with pthread

Only the Linux and macOS targets probably require it. It should not be the case
on Windows. BlackMagic probably doesn't support other platforms than these 3.

For Linux we already build with -pthread. For macOS this is not even needed.

- - - - -
6834aa4f by Steve Lhomme at 2022-03-12T11:54:32+00:00
demux: adaptive: don't force link with pthread

It is already handled by the CXXFLAGS on the platforms that need it.

- - - - -


5 changed files:

- configure.ac
- modules/access/Makefile.am
- modules/demux/Makefile.am
- modules/stream_out/Makefile.am
- modules/video_output/Makefile.am


Changes:

=====================================
configure.ac
=====================================
@@ -130,14 +130,17 @@ case "${host_os}" in
   linux*)
     SYS=linux
     CFLAGS="${CFLAGS} -pthread"
+    CXXFLAGS="${CXXFLAGS} -pthread"
     ;;
   bsdi*)
     SYS=bsdi
     CFLAGS="${CFLAGS} -pthread"
+    CXXFLAGS="${CXXFLAGS} -pthread"
     ;;
   freebsd*)
     SYS=freebsd
     CFLAGS="${CFLAGS} -pthread"
+    CXXFLAGS="${CXXFLAGS} -pthread"
     CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
     LDFLAGS="${LDFLAGS} -L/usr/local/lib"
     ac_cv_ld_z_defs=no


=====================================
modules/access/Makefile.am
=====================================
@@ -132,7 +132,7 @@ if HAVE_WIN32
 libdecklink_plugin_la_LIBADD += $(LIBCOM)
 endif
 if HAVE_LINUX
-libdecklink_plugin_la_LIBADD += $(LIBDL) -lpthread
+libdecklink_plugin_la_LIBADD += $(LIBDL)
 endif
 if HAVE_DECKLINK
 access_LTLIBRARIES += libdecklink_plugin.la


=====================================
modules/demux/Makefile.am
=====================================
@@ -486,9 +486,6 @@ libvlc_adaptive_la_SOURCES += \
 libvlc_adaptive_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir)/demux/adaptive
 libvlc_adaptive_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
 libvlc_adaptive_la_LDFLAGS = -static
-if !HAVE_WIN32
-libvlc_adaptive_la_LDFLAGS += -lpthread
-endif
 libvlc_adaptive_la_LIBADD += libvlc_http.la $(LIBZ)
 if HAVE_GCRYPT
 libvlc_adaptive_la_CXXFLAGS += $(GCRYPT_CFLAGS)


=====================================
modules/stream_out/Makefile.am
=====================================
@@ -59,7 +59,7 @@ if HAVE_WIN32
 libstream_out_sdi_plugin_la_LIBADD += $(LIBCOM)
 endif
 if HAVE_LINUX
-libstream_out_sdi_plugin_la_LIBADD += $(LIBDL) -lpthread
+libstream_out_sdi_plugin_la_LIBADD += $(LIBDL)
 endif
 libstream_out_sdi_plugin_la_SOURCES = stream_out/sdi/sdiout.cpp \
         stream_out/sdi/sdiout.hpp \


=====================================
modules/video_output/Makefile.am
=====================================
@@ -27,7 +27,7 @@ if HAVE_WIN32
 libdecklinkoutput_plugin_la_LIBADD += $(LIBCOM)
 endif
 if HAVE_LINUX
-libdecklinkoutput_plugin_la_LIBADD += $(LIBDL) -lpthread
+libdecklinkoutput_plugin_la_LIBADD += $(LIBDL)
 endif
 vout_LTLIBRARIES += libdecklinkoutput_plugin.la
 endif



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/09bf50d4b1c3da71ffe9206575f25a8f474338d6...6834aa4f8490d4b9e9255a74832ae6246d89b688

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/09bf50d4b1c3da71ffe9206575f25a8f474338d6...6834aa4f8490d4b9e9255a74832ae6246d89b688
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance