mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '8558595a59913a4667f57d5a4658b1340f1a4354'
* commit '8558595a59913a4667f57d5a4658b1340f1a4354': configure: Express atomics/thread deps through the dependency system Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3b6e8634c3
|
@ -1820,6 +1820,13 @@ log2_deps="!libc_msvcrt"
|
|||
|
||||
symver_if_any="symver_asm_label symver_gnu_asm"
|
||||
|
||||
# threading support
|
||||
atomics_gcc_if="sync_val_compare_and_swap"
|
||||
atomics_suncc_if="atomic_cas_ptr machine_rw_barrier"
|
||||
atomics_win32_if="MemoryBarrier"
|
||||
atomics_native_if_any="$ATOMICS_LIST"
|
||||
threads_if_any="$THREADS_LIST"
|
||||
|
||||
# subsystems
|
||||
dct_select="rdft"
|
||||
error_resilience_select="dsputil"
|
||||
|
@ -4354,10 +4361,6 @@ fi
|
|||
disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib
|
||||
disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
|
||||
|
||||
enabled sync_val_compare_and_swap && enable atomics_gcc
|
||||
enabled_all atomic_cas_ptr machine_rw_barrier && enable atomics_suncc
|
||||
enabled MemoryBarrier && enable atomics_win32
|
||||
|
||||
check_lib math.h sin -lm && LIBM="-lm"
|
||||
disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd
|
||||
|
||||
|
@ -4747,10 +4750,6 @@ case $target_os in
|
|||
esac
|
||||
|
||||
enable frame_thread_encoder
|
||||
enabled_any $THREADS_LIST && enable threads
|
||||
enabled_any $ATOMICS_LIST && enable atomics_native
|
||||
|
||||
enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pthread threading without atomics not supported, try adding --enable-pthreads or --cpu=i486 or higher if you are on x86"
|
||||
|
||||
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
|
||||
|
||||
|
@ -4759,6 +4758,8 @@ check_deps $CONFIG_LIST \
|
|||
$HAVE_LIST \
|
||||
$ALL_COMPONENTS \
|
||||
|
||||
enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pthread threading without atomics not supported, try adding --enable-pthreads or --cpu=i486 or higher if you are on x86"
|
||||
|
||||
|
||||
if test $target_os = "haiku"; then
|
||||
disable memalign
|
||||
|
|
Loading…
Reference in New Issue