[FFmpeg-cvslog] Merge commit '5691c746cf62e69806aae1baf0a6e8252d519444'

[James Almer]

ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Sep  2 17:33:30 
2018 -0300| [9a88a47be4da9cd25a582feec7cc36790500b481] | committer: James Almer

Merge commit '5691c746cf62e69806aae1baf0a6e8252d519444'

* commit '5691c746cf62e69806aae1baf0a6e8252d519444':
  configure: Group toolchain parameter mangling functions together

Merged-by: James Almer <jamr...@gmail.com>

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

 configure | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/configure b/configure
index 0da3b580c1..c07ca5a5df 100755
--- a/configure
+++ b/configure
@@ -955,12 +955,32 @@ test_stat(){
     stat "$1" >> $logfile 2>&1
 }
 
+cc_e(){
+    eval printf '%s\\n' $CC_E
+}
+
 cc_o(){
     eval printf '%s\\n' $CC_O
 }
 
-cc_e(){
-    eval printf '%s\\n' $CC_E
+as_o(){
+    eval printf '%s\\n' $AS_O
+}
+
+x86asm_o(){
+    eval printf '%s\\n' $X86ASM_O
+}
+
+ld_o(){
+    eval printf '%s\\n' $LD_O
+}
+
+hostcc_e(){
+    eval printf '%s\\n' $HOSTCC_E
+}
+
+hostcc_o(){
+    eval printf '%s\\n' $HOSTCC_O
 }
 
 test_cc(){
@@ -991,10 +1011,6 @@ test_cpp(){
     test_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC
 }
 
-as_o(){
-    eval printf '%s\\n' $AS_O
-}
-
 test_as(){
     log test_as "$@"
     cat > $TMPS
@@ -1002,10 +1018,6 @@ test_as(){
     test_cmd $as $CPPFLAGS $ASFLAGS "$@" $AS_C $(as_o $TMPO) $TMPS
 }
 
-x86asm_o(){
-    eval printf '%s\\n' $X86ASM_O
-}
-
 test_x86asm(){
     log test_x86asm "$@"
     echo "$1" > $TMPASM
@@ -1077,10 +1089,6 @@ check_x86asm(){
     test_x86asm "$@" && enable $name
 }
 
-ld_o(){
-    eval printf '%s\\n' $LD_O
-}
-
 test_ld(){
     log test_ld "$@"
     type=$1
@@ -1513,14 +1521,6 @@ require_pkg_config(){
     check_pkg_config "$@" || die "ERROR: $pkg_version not found using 
pkg-config$pkg_config_fail_message"
 }
 
-hostcc_e(){
-    eval printf '%s\\n' $HOSTCC_E
-}
-
-hostcc_o(){
-    eval printf '%s\\n' $HOSTCC_O
-}
-
 test_host_cc(){
     log test_host_cc "$@"
     cat > $TMPC


======================================================================

diff --cc configure
index 0da3b580c1,f5f726f6b5..c07ca5a5df
--- a/configure
+++ b/configure
@@@ -950,11 -769,10 +950,15 @@@ test_cmd()
      "$@" >> $logfile 2>&1
  }
  
 +test_stat(){
 +    log test_stat "$@"
 +    stat "$1" >> $logfile 2>&1
 +}
 +
+ cc_e(){
+     eval printf '%s\\n' $CC_E
+ }
+ 
  cc_o(){
      eval printf '%s\\n' $CC_O
  }
@@@ -1077,20 -877,14 +1089,16 @@@ check_x86asm()
      test_x86asm "$@" && enable $name
  }
  
- ld_o(){
-     eval printf '%s\\n' $LD_O
- }
- 
  test_ld(){
      log test_ld "$@"
 -    flags=$(filter_out '-l*' "$@")
 -    libs=$(filter '-l*' "$@")
 -    test_cc $($cflags_filter $flags) || return
 +    type=$1
 +    shift 1
 +    flags=$(filter_out '-l*|*.so' $@)
 +    libs=$(filter '-l*|*.so' $@)
 +    test_$type $($cflags_filter $flags) || return
      flags=$($ldflags_filter $flags)
      libs=$($ldflags_filter $libs)
 -    test_cmd $ld $LDFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs
 +    test_cmd $ld $LDFLAGS $LDEXEFLAGS $flags $(ld_o $TMPE) $TMPO $libs 
$extralibs
  }
  
  check_ld(){
@@@ -1510,17 -1198,9 +1518,9 @@@ require_cpp_condition()
  require_pkg_config(){
      log require_pkg_config "$@"
      pkg_version="$2"
 -    check_pkg_config "$@" || die "ERROR: $pkg_version not found"
 +    check_pkg_config "$@" || die "ERROR: $pkg_version not found using 
pkg-config$pkg_config_fail_message"
  }
  
- hostcc_e(){
-     eval printf '%s\\n' $HOSTCC_E
- }
- 
- hostcc_o(){
-     eval printf '%s\\n' $HOSTCC_O
- }
- 
  test_host_cc(){
      log test_host_cc "$@"
      cat > $TMPC

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog