Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 592732 | Differences between
and this patch

Collapse All | Expand All

(-)sam2p-0.49.2/ccdep.pl.orig (-2 / +12 lines)
Lines 188-194 Link Here
188
  } elsif ($S=~/\A\s{3,}from ([^:]+)/) {
188
  } elsif ($S=~/\A\s{3,}from ([^:]+)/) {
189
    # ^^^ gcc-3.2
189
    # ^^^ gcc-3.2
190
    $included_from=$1;
190
    $included_from=$1;
191
  } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: #warning (NULL-PROVIDES|PROVIDES|CONFLICTS|REQUIRES):(.*)\Z/) {
191
  } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: #warning (NULL-PROVIDES|PROVIDES|CONFLICTS|REQUIRES):(.*)\Z/ ||
192
    $S=~/\A([^:]+):\d+:(\d+:)? warning: (NULL-PROVIDES|PROVIDES|CONFLICTS|REQUIRES): (.*) \[-W#warnings\]\Z/) {
192
    # ^^^ (\d+:)? added for gcc-3.1
193
    # ^^^ (\d+:)? added for gcc-3.1
193
    # print STDERR "[$S]\n";
194
    # print STDERR "[$S]\n";
194
    my($DS,$B)=($1,$3);
195
    my($DS,$B)=($1,$3);
Lines 238-244 Link Here
238
  } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: this is the location of /) {
238
  } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: this is the location of /) {
239
    # ^^^ gcc-3.1
239
    # ^^^ gcc-3.1
240
    undef $included_from;
240
    undef $included_from;
241
  } elsif ($S=~/: No such file or directory$/) {  # Depends on $ENV{LC_ALL}.
241
  } elsif ($S=~/: No such file or directory$/ ||
242
    $S=~/ file not found$/) {  # Depends on $ENV{LC_ALL}.
242
    # ^^^ gcc-3.3
243
    # ^^^ gcc-3.3
243
    undef $included_from;
244
    undef $included_from;
244
  } elsif ($S eq 'compilation terminated.') {  # Useless message, ignore.
245
  } elsif ($S eq 'compilation terminated.') {  # Useless message, ignore.
Lines 240-245 Link Here
240
  } elsif ($S=~/^distcc\[/) {  # Useless message, ignore.
240
  } elsif ($S=~/^distcc\[/) {  # Useless message, ignore.
241
  } elsif ($S=~/^ *#/) {  # Useless message from gcc 4.8, ignore.
241
  } elsif ($S=~/^ *#/) {  # Useless message from gcc 4.8, ignore.
242
  } elsif ($S=~/^ *\^/) {  # Useless message from gcc 4.8, ignore.
242
  } elsif ($S=~/^ *\^/) {  # Useless message from gcc 4.8, ignore.
243
  } elsif ($S=~/warning: treating 'c' input as 'c\+\+' when in C\+\+ mode/) { 
244
  } elsif ($S=~/^\d+ warnings generated.$/ ||
245
    $S=~/^1 warning generated.$/ ||
246
    $S=~/^\d+ errors generated.$/ ||
247
    $S=~/^1 error generated.$/ ||
248
    $S=~/^\d+ warnings and \d+ errors generated.$/ ||
249
    $S=~/^\d+ warnings and 1 error generated.$/ ||
250
    $S=~/^1 warning and 1 error generated.$/) { 
243
  } else {
251
  } else {
244
    die "$0: invalid depret: [$S]\n";
252
    die "$0: invalid depret: [$S]\n";
245
  }
253
  }

Return to bug 592732