diff options
author | James Almer <jamrial@gmail.com> | 2017-11-16 13:11:24 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-11-16 13:11:24 -0300 |
commit | b449af20d5d4b53cdc51696a04477a16336dc22d (patch) | |
tree | 5fec744d04cd9612c498870bad88ae60653ba08c /configure | |
parent | c7812b3bcffaa3fddd141cfa59a41af589766b01 (diff) | |
parent | 9e48de3cc86c732d9cebd496d6f0a2b7e7732754 (diff) |
Merge commit '9e48de3cc86c732d9cebd496d6f0a2b7e7732754'
* commit '9e48de3cc86c732d9cebd496d6f0a2b7e7732754':
configure: Miscellaneous minor changes
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -462,7 +462,6 @@ EOF exit 0 } -quotes='""' if test -t 1 && which tput >/dev/null 2>&1; then ncolors=$(tput colors) if test -n "$ncolors" && test $ncolors -ge 8; then @@ -3733,6 +3732,8 @@ enable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST disabled logging && logfile=/dev/null +# command line configuration sanity checks + # we need to build at least one lib type if ! enabled_any static shared; then cat <<EOF @@ -3884,11 +3885,10 @@ case "$toolchain" in ;; esac -test -n "$cross_prefix" && enable cross_compile - -if enabled cross_compile; then +if test -n "$cross_prefix"; then test -n "$arch" && test -n "$target_os" || die "Must specify target arch (--arch) and OS (--target-os) when cross-compiling" + enable cross_compile fi ar_default="${cross_prefix}${ar_default}" @@ -4889,7 +4889,7 @@ case $target_os in ;; sunos) SHFLAGS='-shared -Wl,-h,$$(@F)' - enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS" + enabled x86 && append SHFLAGS -mimpure-text network_extralibs="-lsocket -lnsl" add_cppflags -D__EXTENSIONS__ # When using suncc to build, the Solaris linker will mark @@ -5774,16 +5774,13 @@ if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then enable pthreads fi check_code cc "pthread.h" "static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER" || disable pthreads -fi - -if enabled pthreads; then - check_func pthread_cancel $pthreads_extralibs + if enabled pthreads; then + check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)" $pthreads_extralibs + check_func pthread_cancel $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 - enabled zlib && check_lib zlib zlib.h zlibVersion -lz enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma @@ -6292,6 +6289,7 @@ if enabled proper_dce; then echo "X { local: *; };" > $TMPV if test_ldflags -Wl,${version_script},$TMPV; then append SHFLAGS '-Wl,${version_script},\$(SUBDIR)lib\$(NAME).ver' + quotes='""' check_cc <<EOF && enable symver_asm_label void ff_foo(void) __asm__ ("av_foo@VERSION"); void ff_foo(void) { ${inline_asm+__asm__($quotes);} } |