Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '61b203ffe6'

Browse source 
* commit '61b203ffe6':
  configure: detect Solaris libc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-09 20:38:17 +01:00
commit 3a5cbc91a4
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure vendored
View file

@ -3600,7 +3600,6 @@ case $target_os in
SHFLAGS='-shared -Wl,-h,$$(@F)' SHFLAGS='-shared -Wl,-h,$$(@F)'
enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS" enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS"
network_extralibs="-lsocket -lnsl" network_extralibs="-lsocket -lnsl"
add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
# 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
# the Solaris assembler. As our libraries contain their own # the Solaris assembler. As our libraries contain their own
@ -3850,6 +3849,9 @@ elif check_cpp_condition stddef.h "defined __KLIBC__"; then
libc_type=klibc libc_type=klibc
elif check_cpp_condition sys/cdefs.h "defined __BIONIC__"; then elif check_cpp_condition sys/cdefs.h "defined __BIONIC__"; then
libc_type=bionic libc_type=bionic
elif check_cpp_condition sys/brand.h "defined SOLARIS_BRAND_NAME"; then
libc_type=solaris
add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
fi fi
test -n "$libc_type" && enable $libc_type test -n "$libc_type" && enable $libc_type