Experimental Physics and
Industrial Control System

Janet Anderson <[email protected]> · Wed, 20 Dec 2006 09:28:18 -0600

Benjamin Franksen wrote:

Hi All,

there is another bug in mkmf.pl: If the full file path of a dependency

gets too long, it gets wrapped (and line-ending backslashes inserted at

the wrong places). In fact there is a call wrap(...) from module

Text::Wrap and its docs say: "Lines are wrapped at $Text::Wrap::columns

columns. $Text::Wrap::columns should be set to the full width of your

output device. In fact, every resulting line will have length of no

more than $columns - 1." which is clearly not acceptable for a file

that may contain arbitrarily long file names.

I have removed the wrapping code in mkmf.pl.

I have attached a patch to fix this, relative to R3.14.8.2 (apply in

configure/tools). The patch also removes the code that adds each

dependency as an additional target. The script said that this is to

avoid "no rule to make target..." warnings; I think this is an artefact

of the old (3.13) build system and is no longer necessary in 3.14.

I have removed the code adding each dependency as a target.  Thanks.

Cheers
Ben

------------------------------------------------------------------------

Index: mkmf.pl
===================================================================
RCS file: /opt/repositories/controls/epics/base/3.14/configure/tools/mkmf.pl,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 mkmf.pl
28,30d27
< use Text::Wrap;

<

< $Text::Wrap::columns = 76;

34d30
< my %delim_match = ( q/'/ => q/'/, q/"/ => q/"/);
78c74
<    my $line;
---

   my $deps;

90,101c86,87
<    $line = "$objFile : @includes";
<    $fmtline = wrap ("", "  ", $line);
<    $fmtline =~ s/\n/ \\\n/mg;
<    print $fmtline;

<

< print "\n\n";

<    print "#Depend files must be targets to avoid 'No rule to make target ...' errors\n";

<

< #$line = "@includes";

<    foreach $file (@includes) {
<        print "$file :\n";
<    }
---

   $deps = join(" \\\n  ",@includes);
   print "$objFile :$deps\n";

142,145c128,130
<    return 0 if !($line =~ m/^[	  ]*\#?[	 ]*include/);
<    return 0 if !($line =~ /^[\#?\s]*include\s*(['""'<])([\w\.\/]*)$delim_match{\1}/ix);
<    return 0 if !$2;
<    $incname = $2;
---

   return 0 if not $line =~ /^#?\s*include\s*('.*?'|<.*?>|".*?")/;
   $incname = substr $1, 1, length($1)-2;
   print "DEBUG: $incname\n" if $debug;

158d142

<

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System