[FFmpeg-cvslog] build: avoid stdin stall with GNU AS probing.
Clément Bœsch
git at videolan.org
Mon Nov 18 15:19:32 CET 2013
ffmpeg | branch: release/1.0 | Clément Bœsch <u at pkh.me> | Fri Nov 8 23:55:06 2013 +0100| [0227ecc21f1a1247a5a55da1a3628283f606837b] | committer: Carl Eugen Hoyos
build: avoid stdin stall with GNU AS probing.
a758c5e added probing for various tools, such as AS. Unfortunately, GNU
AS is reading stdin with -v, and thus configure is stalled with
configure arguments such as --as=as.
Fixes Ticket #1898.
(cherry picked from commit dbb41f93c16cbc65a899a75723c95da51c851cd5)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0227ecc21f1a1247a5a55da1a3628283f606837b
---
configure | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 71396b2..96b72bf 100755
--- a/configure
+++ b/configure
@@ -2495,7 +2495,9 @@ probe_cc(){
unset _depflags _DEPCMD _DEPFLAGS
_flags_filter=echo
- if $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
+ if $_cc --version 2>&1 | grep -q '^GNU assembler'; then
+ true # no-op to avoid reading stdin in following checks
+ elif $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
_type=llvm_gcc
gcc_extra_ver=$(expr "$($_cc --version | head -n1)" : '.*\((.*)\)')
_ident="llvm-gcc $($_cc -dumpversion) $gcc_extra_ver"
More information about the ffmpeg-cvslog
mailing list