[FFmpeg-devel] configure: add pthreads ldflags globally

Submitted by James Almer on Oct. 14, 2017, 4:30 p.m.

Details

Message ID 20171014163009.240-1-jamrial@gmail.com
State New
Headers show

Commit Message

James Almer Oct. 14, 2017, 4:30 p.m.
It's used by libavutil and by extension every other library, and by
making it global we simplify a lot of checks.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 configure | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/configure b/configure
index a0bfb269e8..09f8ed305b 100755
--- a/configure
+++ b/configure
@@ -3327,7 +3327,6 @@  transcode_aac_example_deps="avcodec avformat swresample"
 transcoding_example_deps="avfilter avcodec avformat avutil"
 
 # EXTRALIBS_LIST
-cpu_init_extralibs="pthreads_extralibs"
 cws2fws_extralibs="zlib_extralibs"
 
 # libraries, in linking order
@@ -3344,9 +3343,8 @@  swresample_deps="avutil"
 swresample_suggest="libsoxr"
 swscale_deps="avutil"
 
-avcodec_extralibs="pthreads_extralibs iconv_extralibs"
-avfilter_extralibs="pthreads_extralibs"
-avutil_extralibs="nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs"
+avcodec_extralibs="iconv_extralibs"
+avutil_extralibs="nanosleep_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs"
 
 # programs
 ffmpeg_deps="avcodec avfilter avformat swresample"
@@ -5925,6 +5923,7 @@  fi
 
 
 if enabled pthreads; then
+  add_extralibs $pthreads_extralibs
   check_func pthread_cancel $pthreads_extralibs
 fi
 
@@ -5993,7 +5992,7 @@  enabled libgme            && { use_pkg_config libgme libgme gme/gme.h gme_new_em
 enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
                                    check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
                                done || die "ERROR: libgsm not found"; }
-enabled libilbc           && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc $pthreads_extralibs
+enabled libilbc           && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
 enabled libkvazaar        && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kvazaar.h kvz_api_get
 # While it may appear that require is being used as a pkg-config
 # fallback for libmfx, it is actually being used to detect a different
@@ -6094,7 +6093,7 @@  enabled libx264           && { use_pkg_config libx264 x264 "stdint.h x264.h" x26
                                enable libx262; }
 enabled libx265           && require_pkg_config libx265 x265 x265.h x265_api_get &&
                              require_cpp_condition x265.h "X265_BUILD >= 68"
-enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs"
+enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs
 enabled libxvid           && require libxvid xvid.h xvid_global -lxvidcore
 enabled libzimg           && require_pkg_config libzimg "zimg >= 2.3.0" zimg.h zimg_get_api_version
 enabled libzmq            && require_pkg_config libzmq libzmq zmq.h zmq_ctx_new