diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:52:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:52:14 +0100 |
| commit | 8e702bd3a8f5a4271590ab5aa38a41087ceaab1b (patch) | |
| tree | b250e79863728fe064c327702e9a2eb9dce489af /configure | |
| parent | c9afeda55ef29534d7b565bd613122227e046d5b (diff) | |
| parent | d64341e498fa46c6cf4c23d408177d7489559654 (diff) | |
| download | ffmpeg-8e702bd3a8f5a4271590ab5aa38a41087ceaab1b.tar.gz | |
Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'
* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
configure: Prefix libc-related variables with "libc_"
Conflicts:
libavdevice/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1540,6 +1540,7 @@ HAVE_LIST=" jack_port_get_latency_range kbhit ldbrx + libc_msvcrt libdc1394_1 libdc1394_2 local_aligned_16 @@ -1559,7 +1560,6 @@ HAVE_LIST=" mm_empty mmap mprotect - msvcrt nanosleep openjpeg_1_5_openjpeg_h PeekNamedPipe @@ -1794,7 +1794,7 @@ need_memalign="altivec neon sse" symver_if_any="symver_asm_label symver_gnu_asm" -log2_deps="!msvcrt" +log2_deps="!libc_msvcrt" # subsystems dct_select="rdft" @@ -3854,7 +3854,7 @@ elif check_cpp_condition sys/brand.h "defined SOLARIS_BRAND_NAME"; then add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 fi -test -n "$libc_type" && enable $libc_type +test -n "$libc_type" && enable libc_$libc_type case $libc_type in bionic) @@ -3870,7 +3870,7 @@ esac # hacks for compiler/libc/os combinations -if enabled_all tms470 glibc; then +if enabled_all tms470 libc_glibc; then CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}" add_cppflags -D__USER_LABEL_PREFIX__= add_cppflags -D__builtin_memset=memset @@ -3878,7 +3878,7 @@ if enabled_all tms470 glibc; then add_cflags -pds=48 # incompatible redefinition of macro fi -if enabled_all ccc glibc; then +if enabled_all ccc libc_glibc; then add_ldflags -Wl,-z,now # calls to libots crash without this fi |