[SCM] libav/experimental: configure: Handle armcc 5.0

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4936ef6492f640e1606c6507f2c4e495164d3974
Author: Martin Storsjö <martin at martin.st>
Date:   Fri Apr 18 23:40:59 2014 +0300

    configure: Handle armcc 5.0
    
    The first line of the "armcc --vsn" output in one version is
    "Product: ARM Compiler 5.04".
    
    Signed-off-by: Martin Storsjö <martin at martin.st>

diff --git a/configure b/configure
index 63a9e72..8200b4b 100755
--- a/configure
+++ b/configure
@@ -2766,10 +2766,10 @@ probe_cc(){
         _cflags_speed='-fast'
         _cflags_size='-O1'
         _flags_filter=ccc_flags
-    elif $_cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then
+    elif $_cc --vsn 2>/dev/null | grep -Eq "ARM (C/C\+\+ )?Compiler"; then
         test -d "$sysroot" || die "No valid sysroot specified."
         _type=armcc
-        _ident=$($_cc --vsn | head -n1)
+        _ident=$($_cc --vsn | head -n1 | sed 's/.*: //')
         armcc_conf="$PWD/armcc.conf"
         $_cc --arm_linux_configure                 \
              --arm_linux_config_file="$armcc_conf" \
@@ -4290,6 +4290,8 @@ elif enabled cparser; then
     add_cflags -Wno-missing-variable-declarations
     add_cflags -Wno-empty-statement
 elif enabled armcc; then
+    add_cflags -W${armcc_opt},--diag_suppress=4343 # hardfp compat
+    add_cflags -W${armcc_opt},--diag_suppress=3036 # using . as system include dir
     # 2523: use of inline assembler is deprecated
     add_cflags -W${armcc_opt},--diag_suppress=2523
     add_cflags -W${armcc_opt},--diag_suppress=1207

-- 
Libav/FFmpeg packaging