[SCM] libav/experimental: configure: Don't pass MSVC compiler options -M[TD] to armasm

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Aug 30 15:49:43 UTC 2014


The following commit has been merged in the experimental branch:
commit 08b94f160a2c966bb83e32bde0e52246fafa2155
Author: Martin Storsjö <martin at martin.st>
Date:   Sun Aug 10 14:40:09 2014 +0300

    configure: Don't pass MSVC compiler options -M[TD] to armasm
    
    The -MD option (for enabling a dynamically linked crt) gets interpreted
    as a cpp option for generating dependency information (into a file named
    '-.d', when preprocessing to a pipe). We shouldn't be passing
    any and all C compiler flags to armasm (which is a plain assembler,
    only with cpp bolted on via gas-preprocessor), but these are the
    main conflicting ones.
    
    Signed-off-by: Martin Storsjö <martin at martin.st>

diff --git a/configure b/configure
index 411af5e..a5ad34c 100755
--- a/configure
+++ b/configure
@@ -2614,6 +2614,17 @@ EOF
     die "Sanity test failed."
 fi
 
+armasm_flags(){
+    for flag; do
+        case $flag in
+            # Filter out MSVC cl.exe options from cflags that shouldn't
+            # be passed to gas-preprocessor
+            -M[TD]*)                                            ;;
+            *)                  echo $flag                      ;;
+        esac
+   done
+}
+
 ccc_flags(){
     for flag; do
         case $flag in
@@ -2886,6 +2897,7 @@ probe_cc(){
         _ident=$($_cc | head -n1)
         # 4509: "This form of conditional instruction is deprecated"
         _flags="-nologo -ignore 4509"
+        _flags_filter=armasm_flags
     elif $_cc 2>&1 | grep -q Microsoft; then
         _type=msvc
         _ident=$($cc 2>&1 | head -n1)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list