OpenWrt packages
Sign in or create your account | Project List | Help
OpenWrt packages Git Source Tree
Root/
| 1 | Index: plplot-5.9.7/bindings/octave/matwrap/matwrap |
| 2 | =================================================================== |
| 3 | --- plplot-5.9.7.orig/bindings/octave/matwrap/matwrap 2011-01-04 13:31:52.000000000 +0100 |
| 4 | +++ plplot-5.9.7/bindings/octave/matwrap/matwrap 2011-01-04 13:52:42.000000000 +0100 |
| 5 | @@ -21,7 +21,9 @@ |
| 6 | # |
| 7 | # Parse the command line arguments: |
| 8 | # |
| 9 | -@cpp_ignore_dirs = ('/usr/include/', '/usr/local/include/'); |
| 10 | +# double-slash prefixes occur with newer GCCs and cause this script to fail |
| 11 | +# if not treated here. See also regexp fixes below. |
| 12 | +@cpp_ignore_dirs = ('/usr/include/', '/usr/local/include/', '//usr/include/', '//usr/local/include/'); |
| 13 | # Directory hierarchies to ignore when the |
| 14 | # -cpp switch is active. These should be |
| 15 | # followed by a trailing slash to avoid |
| 16 | @@ -214,8 +216,8 @@ |
| 17 | # Then it must have been included at the |
| 18 | # top level. Add it to our list. |
| 19 | my $incstr = $fname; # Assume we include the file as is. |
| 20 | - if ($incstr =~ s@^/usr/include/@@ || # Is it a system include file? |
| 21 | - $incstr =~ s@^/usr/local/include/@@ || |
| 22 | + if ($incstr =~ s@^/+usr/include/@@ || # Is it a system include file? |
| 23 | + $incstr =~ s@^/+usr/local/include/@@ || |
| 24 | $incstr =~ s@.*/gcc-lib/.*/include/@@) { # Is it a system include |
| 25 | # file that was fixed by gcc? |
| 26 | $include_str .= "#include <$incstr>\n"; # Use a different syntax. |
| 27 | @@ -228,6 +230,8 @@ |
| 28 | grep(substr($fname, 0, length($_)) eq $_, @cpp_ignore_dirs) || |
| 29 | # Or does it begin with the list of forbidden |
| 30 | # directories? |
| 31 | + $fname =~ m@/gcc/@ || |
| 32 | + $fname =~ m@rej.h@ || |
| 33 | $fname =~ m@/gcc-lib/@) { # Somewhere in gcc fixed includes? |
| 34 | $remember_defs_in_file = 0; # We're not really interested in this file. |
| 35 | } else { |
| 36 |
