[FFmpeg-cvslog] build: avoid stdin stall with GNU AS probing.

Clément Bœsch git at videolan.org
Sat Nov 9 12:39:05 CET 2013


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri Nov  8 23:55:06 2013 +0100| [dbb41f93c16cbc65a899a75723c95da51c851cd5] | committer: Clément Bœsch

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbb41f93c16cbc65a899a75723c95da51c851cd5
---

 configure |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 72abb0d..5f80764 100755
--- a/configure
+++ b/configure
@@ -2889,7 +2889,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