Change 19121 by [EMAIL PROTECTED] on 2003/04/01 16:36:02
Integrate:
[ 19109]
Subject: [PATCH 5.8.1 @19053] Time::HiRes
From: Ilya Zakharevich <[EMAIL PROTECTED]>
Date: Mon, 31 Mar 2003 12:53:01 -0800
Message-ID: <[EMAIL PROTECTED]>
[ 19111]
A cleaner way to detect PERL_CORE, from IlyaZ.
Affected files ...
... //depot/perl/ext/Time/HiRes/HiRes.t#24 integrate
... //depot/perl/ext/Time/HiRes/Makefile.PL#8 integrate
Differences ...
==== //depot/perl/ext/Time/HiRes/HiRes.t#24 (text) ====
Index: perl/ext/Time/HiRes/HiRes.t
--- perl/ext/Time/HiRes/HiRes.t#23~18034~ Sun Oct 20 06:23:16 2002
+++ perl/ext/Time/HiRes/HiRes.t Tue Apr 1 08:36:02 2003
@@ -30,7 +30,7 @@
use Config;
-my $xdefine;
+my $xdefine = '';
if (open(XDEFINE, "xdefine")) {
chomp($xdefine = <XDEFINE>);
==== //depot/perl/ext/Time/HiRes/Makefile.PL#8 (text) ====
Index: perl/ext/Time/HiRes/Makefile.PL
--- perl/ext/Time/HiRes/Makefile.PL#7~18916~ Tue Mar 11 03:40:38 2003
+++ perl/ext/Time/HiRes/Makefile.PL Tue Apr 1 08:36:02 2003
@@ -14,8 +14,8 @@
my $LIBS;
my $XSOPT;
-unless($ENV{PERL_CORE}) { # This trick from Encode/Makefile.PL.
- $ENV{PERL_CORE} = 1 if ($^X =~ m{\bminiperl[^/\\\]>:]*$}o);
+unless($ENV{PERL_CORE}) {
+ $ENV{PERL_CORE} = 1 if grep { $_ eq 'PERL_CORE=1' } @ARGV;
}
# Perls 5.002 and 5.003 did not have File::Spec, fake what we need.
End of Patch.
