virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

configure: Miscellaneous minor changes

Browse Source 
- Move a variable closer to where it is used
- Add an explanatory comment
- Simplify a crosscompile check
- Minor SHFLAGS simplification
- Coalesce some threads tests
This commit is contained in:
Diego Biurrun
2017-09-24 18:46:47 +02:00
parent 5c2a01f064
commit 9e48de3cc8
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@@ -347,8 +347,6 @@ EOF
exit 0 exit 0
} }
quotes='""'
log(){ log(){
echo "$@" >> $logfile echo "$@" >> $logfile
} }
@@ -2861,6 +2859,8 @@ done
disabled logging && logfile=/dev/null disabled logging && logfile=/dev/null
# command line configuration sanity checks
# we need to build at least one lib type # we need to build at least one lib type
if ! enabled_any static shared; then if ! enabled_any static shared; then
cat <<EOF cat <<EOF
@@ -3001,11 +3001,10 @@ case "$toolchain" in
;; ;;
esac esac
test -n "$cross_prefix" && enable cross_compile if test -n "$cross_prefix"; then
if enabled cross_compile; then
test -n "$arch" && test -n "$target_os" || test -n "$arch" && test -n "$target_os" ||
die "Must specify target arch (--arch) and OS (--target-os) when cross-compiling" die "Must specify target arch (--arch) and OS (--target-os) when cross-compiling"
enable cross_compile
fi fi
ar_default="${cross_prefix}${ar_default}" ar_default="${cross_prefix}${ar_default}"
@@ -3828,7 +3827,7 @@ case $target_os in
;; ;;
sunos) sunos)
SHFLAGS='-shared -Wl,-h,$$(@F)' SHFLAGS='-shared -Wl,-h,$$(@F)'
enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS" enabled x86 && append SHFLAGS -mimpure-text
network_extralibs="-lsocket -lnsl" network_extralibs="-lsocket -lnsl"
# When using suncc to build, the Solaris linker will mark # When using suncc to build, the Solaris linker will mark
# an executable with each instruction set encountered by # an executable with each instruction set encountered by
@@ -4563,11 +4562,10 @@ if ! disabled pthreads && ! enabled w32threads; then
elif check_func pthread_join; then elif check_func pthread_join; then
enable pthreads enable pthreads
fi fi
enabled pthreads &&
check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)" $pthreads_extralibs
fi fi
enabled pthreads &&
check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)" $pthreads_extralibs
disabled zlib || check_lib zlib zlib.h zlibVersion -lz disabled zlib || check_lib zlib zlib.h zlibVersion -lz
disabled bzlib || check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 disabled bzlib || check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
@@ -4849,6 +4847,7 @@ if enabled proper_dce; then
echo "X { local: *; };" > $TMPV echo "X { local: *; };" > $TMPV
if test_ldflags -Wl,${version_script},$TMPV; then if test_ldflags -Wl,${version_script},$TMPV; then
append SHFLAGS '-Wl,${version_script},\$(SUBDIR)lib\$(NAME).ver' append SHFLAGS '-Wl,${version_script},\$(SUBDIR)lib\$(NAME).ver'
quotes='""'
check_cc <<EOF && enable symver_asm_label check_cc <<EOF && enable symver_asm_label
void ff_foo(void) __asm__ ("av_foo@VERSION"); void ff_foo(void) __asm__ ("av_foo@VERSION");
void ff_foo(void) { ${inline_asm+__asm__($quotes);} } void ff_foo(void) { ${inline_asm+__asm__($quotes);} }