[patch] Extend sam2p dependency detection script to cope with various new and changed error and warning messages of gcc and clang

sam2p-0.49.2-ccdep.patch (text/plain), 1.74 KB, created by Michael Weiser on 2016-09-02 16:16:12 UTC

--- sam2p-0.49.2/ccdep.pl.orig	2016-05-17 18:39:20.000000000 +0200
+++ sam2p-0.49.2/ccdep.pl	2016-05-17 18:40:11.000000000 +0200
@@ -188,7 +188,8 @@
   } elsif ($S=~/\A\s{3,}from ([^:]+)/) {
     # ^^^ gcc-3.2
     $included_from=$1;
-  } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: #warning (NULL-PROVIDES|PROVIDES|CONFLICTS|REQUIRES):(.*)\Z/) {
+  } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: #warning (NULL-PROVIDES|PROVIDES|CONFLICTS|REQUIRES):(.*)\Z/ ||
+    $S=~/\A([^:]+):\d+:(\d+:)? warning: (NULL-PROVIDES|PROVIDES|CONFLICTS|REQUIRES): (.*) \[-W#warnings\]\Z/) {
     # ^^^ (\d+:)? added for gcc-3.1
     # print STDERR "[$S]\n";
     my($DS,$B)=($1,$3);
@@ -238,7 +238,8 @@
   } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: this is the location of /) {
     # ^^^ gcc-3.1
     undef $included_from;
-  } elsif ($S=~/: No such file or directory$/) {  # Depends on $ENV{LC_ALL}.
+  } elsif ($S=~/: No such file or directory$/ ||
+    $S=~/ file not found$/) {  # Depends on $ENV{LC_ALL}.
     # ^^^ gcc-3.3
     undef $included_from;
   } elsif ($S eq 'compilation terminated.') {  # Useless message, ignore.
@@ -240,6 +240,14 @@
   } elsif ($S=~/^distcc\[/) {  # Useless message, ignore.
   } elsif ($S=~/^ *#/) {  # Useless message from gcc 4.8, ignore.
   } elsif ($S=~/^ *\^/) {  # Useless message from gcc 4.8, ignore.
+  } elsif ($S=~/warning: treating 'c' input as 'c\+\+' when in C\+\+ mode/) { 
+  } elsif ($S=~/^\d+ warnings generated.$/ ||
+    $S=~/^1 warning generated.$/ ||
+    $S=~/^\d+ errors generated.$/ ||
+    $S=~/^1 error generated.$/ ||
+    $S=~/^\d+ warnings and \d+ errors generated.$/ ||
+    $S=~/^\d+ warnings and 1 error generated.$/ ||
+    $S=~/^1 warning and 1 error generated.$/) { 
   } else {
     die "$0: invalid depret: [$S]\n";
   }