virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit '9f8cf50e3be04b8e178086edaa4598826143303d'

Browse Source 
* commit '9f8cf50e3be04b8e178086edaa4598826143303d':
  configure: Enable gas-preprocessor on all OSes but only if available

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-10 19:16:42 +02:00
commit 7e4e45d227
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@ -2657,8 +2657,6 @@ strip_default="strip"
yasmexe_default="yasm" yasmexe_default="yasm"
windres_default="windres" windres_default="windres"
nogas=":"
# OS # OS
target_os_default=$(tolower $(uname -s)) target_os_default=$(tolower $(uname -s))
host_os=$target_os_default host_os=$target_os_default
@ -3975,7 +3973,6 @@ case $target_os in
strip="strip -d" strip="strip -d"
;; ;;
darwin) darwin)
test "${as#*gas-preprocessor.pl}" != "$as" || gas="${gas:=gas-preprocessor.pl} ${as:=$cc}"
enabled ppc && add_asflags -force_cpusubtype_ALL enabled ppc && add_asflags -force_cpusubtype_ALL
SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)' SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
@ -4368,8 +4365,22 @@ EOF
} }
if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
nogas=:
enabled_any arm aarch64 && nogas=die enabled_any arm aarch64 && nogas=die
enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn
as_noop=-v
case $as_type in
arm*) gaspp_as_type=armasm; as_noop=-h ;;
gcc) gaspp_as_type=gas ;;
*) gaspp_as_type=$as_type ;;
esac
[ $target_os = "darwin" ] && gaspp_as_type="apple-$gaspp_as_type"
test "${as#*gas-preprocessor.pl}" != "$as" ||
check_cmd gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type -- ${as:=$cc} $as_noop &&
gas="${gas:=gas-preprocessor.pl} -arch $arch -as-type $gaspp_as_type -- ${as:=$cc}"
if ! check_gas ; then if ! check_gas ; then
as=${gas:=$as} as=${gas:=$as}