Change 18418 by jhi@lyta on 2003/01/03 19:41:57
Upgrade to Time::HiRes 1.41 (building with core perl had
become broken at some point, even before 1.40).
Affected files ...
... //depot/maint-5.8/perl/ext/Time/HiRes/Changes#5 edit
... //depot/maint-5.8/perl/ext/Time/HiRes/HiRes.pm#5 edit
... //depot/maint-5.8/perl/ext/Time/HiRes/Makefile.PL#6 edit
Differences ...
==== //depot/maint-5.8/perl/ext/Time/HiRes/Changes#5 (text) ====
Index: perl/ext/Time/HiRes/Changes
--- perl/ext/Time/HiRes/Changes#4~18416~ Fri Jan 3 09:50:45 2003
+++ perl/ext/Time/HiRes/Changes Fri Jan 3 11:41:57 2003
@@ -1,5 +1,15 @@
Revision history for Perl extension Time::HiRes.
+1.41
+ - At some point the ability to figure our the correct incdir
+ for EXTERN.h (either a core perl build, or an installed perl)
+ had broken (which lead into all test compiles failing with
+ a core perl build, but thanks to the robustness of Makefile.PL
+ nothing of was visible). The brokenness seemed to be caused
+ by $ENV{PERL_CORE} not being on for core builds? Now stole
+ a trick from the Encode that sets $ENV{PERL_CORE} right, and
+ both styles of build should work again.
+
1.40
- Nick Clark noticed that the my_catdir() emulation function
was broken (which means that we didn't really work for Perls
==== //depot/maint-5.8/perl/ext/Time/HiRes/HiRes.pm#5 (text) ====
Index: perl/ext/Time/HiRes/HiRes.pm
--- perl/ext/Time/HiRes/HiRes.pm#4~18416~ Fri Jan 3 09:50:45 2003
+++ perl/ext/Time/HiRes/HiRes.pm Fri Jan 3 11:41:57 2003
@@ -15,7 +15,7 @@
d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer
d_nanosleep);
-$VERSION = '1.40';
+$VERSION = '1.41';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
==== //depot/maint-5.8/perl/ext/Time/HiRes/Makefile.PL#6 (text) ====
Index: perl/ext/Time/HiRes/Makefile.PL
--- perl/ext/Time/HiRes/Makefile.PL#5~18416~ Fri Jan 3 09:50:45 2003
+++ perl/ext/Time/HiRes/Makefile.PL Fri Jan 3 11:41:57 2003
@@ -14,6 +14,10 @@
my $LIBS;
my $XSOPT;
+unless($ENV{PERL_CORE}) { # This trick from Encode/Makefile.PL.
+ $ENV{PERL_CORE} = 1 if ($^X =~ m{\bminiperl[^/\\\]>:]*$}o);
+}
+
# Perls 5.002 and 5.003 did not have File::Spec, fake what we need.
sub my_dirsep {
@@ -81,13 +85,16 @@
my $errornull;
my $COREincdir;
+
if ($ENV{PERL_CORE}) {
my $updir = File::Spec->updir;
$COREincdir = File::Spec->catdir(($updir) x 3);
} else {
$COREincdir = File::Spec->catdir($Config{'archlibexp'}, 'CORE');
}
+
my $ccflags = $Config{'ccflags'} . ' ' . "-I$COREincdir";
+
if ($^O eq 'VMS') {
if ($ENV{PERL_CORE}) {
# Fragile if the extensions change hierachy within
@@ -106,8 +113,9 @@
$errornull = '';
}
- $cccmd = "$Config{'cc'} -o $tmp $ccflags $tmp.c @$LIBS $errornull"
+ $cccmd = "$Config{'cc'} -o $tmp $ccflags $tmp.c @$LIBS $errornull"
unless defined $cccmd;
+
if ($^O eq 'VMS') {
open( CMDFILE, ">$tmp.com" );
print CMDFILE "\$ SET MESSAGE/NOFACILITY/NOSEVERITY/NOIDENT/NOTEXT\n";
@@ -219,13 +227,16 @@
print "Checking for libraries...\n";
my $lib;
for $lib (@$LIBS) {
- print "Checking for $lib...\n";
+ print "Checking for $lib... ";
$LIBS = [ $lib ];
if ($Config{libs} =~ /\b$lib\b/ || has_x("time(0)")) {
push @goodlibs, $lib;
+ print "found.\n";
+ } else {
+ print "NOT found.\n";
}
}
- @$LIBS = @goodlibs;
+ $LIBS = [ @goodlibs ];
print @$LIBS ?
"You have extra libraries: @$LIBS.\n" :
"You have no applicable extra libraries.\n";
End of Patch.
