Change 14322 by jhi@alpha on 2002/01/18 00:21:11
Subject: [PATCH] Re: [PATCH] Re: ndbm failing on linux ?
From: Michael G Schwern <[EMAIL PROTECTED]>
Date: Thu, 17 Jan 2002 20:12:20 -0500
Message-ID: <20020118011220.GC32762@blackrider>
(#14317 replaced with this)
Affected files ...
.... //depot/perl/lib/ExtUtils/MakeMaker.pm#79 edit
Differences ...
==== //depot/perl/lib/ExtUtils/MakeMaker.pm#79 (text) ====
Index: perl/lib/ExtUtils/MakeMaker.pm
--- perl/lib/ExtUtils/MakeMaker.pm.~1~ Thu Jan 17 17:30:05 2002
+++ perl/lib/ExtUtils/MakeMaker.pm Thu Jan 17 17:30:05 2002
@@ -163,20 +163,9 @@
sub eval_in_x {
my($self,$dir) = @_;
package main;
- chdir $dir or
- Carp::carp("Couldn't change to directory $dir: $!");
+ chdir $dir or Carp::carp("Couldn't change to directory $dir: $!");
- {
- local *FH;
- open(FH,"Makefile.PL") or
- Carp::carp("Couldn't open Makefile.PL in $dir");
- local $/; # Sluuurp.
- my $eval = join "", <FH>;
- close FH;
- # eval, not do, since we need lexical variables
- eval $eval;
- }
-
+ eval { do './Makefile.PL' };
if ($@) {
# if ($@ =~ /prerequisites/) {
# die "MakeMaker WARNING: $@";
@@ -687,11 +676,18 @@
} continue {
last unless $hint =~ s/_[^_]*$//; # nothing to cut off
}
- return unless -f "hints/$hint.pl"; # really there
+ my $hint_file = "hints/$hint.pl";
+
+ return unless -f $hint_file; # really there
# execute the hintsfile:
- print STDOUT "Processing hints file hints/$hint.pl\n";
- eval { do "hints/$hint.pl" };
+ print STDOUT "Processing hints file $hint_file\n";
+ {
+ local *HINT;
+ open(HINT, $hint_file) || die "Can't open $hint_file: $!";
+ eval join '', <HINT>;
+ close HINT;
+ }
print STDOUT $@ if $@;
}
End of Patch.
