Change 19061 by [EMAIL PROTECTED] on 2003/03/26 19:23:37

        Integrate:
        [ 19055]
        Subject: no more 'make install && make test' with shared libperl.so on Linux
        From: Enache Adrian <[EMAIL PROTECTED]>
        Date: Sat, 22 Mar 2003 22:49:49 +0200
        Message-ID: <[EMAIL PROTECTED]>
        
        This is a slightly more defensive patch than Chip's patch that
        fell through the cracks, but does the same
        Subject: Shared libperl.so and build issues
        From: Chip Turner <[EMAIL PROTECTED]>
        Date: Tue 31 Dec 2002 17:21
        
        [ 19056]
        Subject: Re: Smoke [5.9.0] 19055 FAIL(m) linux 2.4.18-3 (i686/1 cpu)
        From: Enache Adrian <[EMAIL PROTECTED]>
        Date: Mon, 24 Mar 2003 23:56:25 +0200
        Message-ID: <[EMAIL PROTECTED]>
        
        [ 19057]
        Typo, spotted by Doru Petrescu
        Message-ID: <[EMAIL PROTECTED]>
        
        [ 19058]
        Subject: [PATCH pod/perlhist.pod] Adding the latest version of Perl
        From: Michael G Schwern <[EMAIL PROTECTED]>
        Date: Mon, 24 Mar 2003 00:50:39 -0800
        Message-ID: <[EMAIL PROTECTED]>
        
        [ 19059]
        Change 19056 wasn't good enough.
        ldlibpth should be changed later, to avoid spaces to be quoted.
        
        [ 19060]
        Subject: [PATCH] lib/vmsish.t GMT bug fix
        From: "Craig A. Berry" <[EMAIL PROTECTED]>
        Date: Tue, 25 Mar 2003 22:52:58 -0600
        Message-ID: <[EMAIL PROTECTED]>

Affected files ...

... //depot/maint-5.8/perl/Makefile.SH#7 integrate
... //depot/maint-5.8/perl/ext/Data/Dumper/Dumper.pm#4 integrate
... //depot/maint-5.8/perl/lib/vmsish.t#2 integrate
... //depot/maint-5.8/perl/pod/perlhist.pod#2 integrate

Differences ...

==== //depot/maint-5.8/perl/Makefile.SH#7 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#6~18866~   Sun Mar  9 05:59:01 2003
+++ perl/Makefile.SH    Wed Mar 26 11:23:37 2003
@@ -108,6 +108,13 @@
 esac
 
 case "$osname" in
+linux)
+       case "$useshrplib" in
+       true)
+           ldlibpth="LD_PRELOAD=\"\$\$LD_PRELOAD `pwd`/$libperl\" $ldlibpth"
+           ;;
+       esac
+       ;;
 os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
        ;;
 esac

==== //depot/maint-5.8/perl/ext/Data/Dumper/Dumper.pm#4 (text) ====
Index: perl/ext/Data/Dumper/Dumper.pm
--- perl/ext/Data/Dumper/Dumper.pm#3~19008~     Sun Mar 16 20:59:15 2003
+++ perl/ext/Data/Dumper/Dumper.pm      Wed Mar 26 11:23:37 2003
@@ -664,7 +664,7 @@
 
     # configuration variables
     {
-      local $Data::Dump::Purity = 1;
+      local $Data::Dumper::Purity = 1;
       eval Data::Dumper->Dump([$foo, $bar], [qw(foo *ary)]);
     }
 

==== //depot/maint-5.8/perl/lib/vmsish.t#2 (text) ====
Index: perl/lib/vmsish.t
--- perl/lib/vmsish.t#1~17645~  Fri Jul 19 12:29:57 2002
+++ perl/lib/vmsish.t   Wed Mar 26 11:23:37 2003
@@ -114,6 +114,10 @@
   }
   {
      use_ok('vmsish qw(time)');
+
+     # but that didn't get it in our current scope
+     use vmsish qw(time);
+
      $vmstime   = time;
      @vmslocal  = localtime($vmstime);
      @vmsgmtime = gmtime($vmstime);
@@ -130,23 +134,23 @@
   # since it's unlikely local time will differ from UTC by so small
   # an amount, and it renders the test resistant to delays from
   # things like stat() on a file mounted over a slow network link.
-  ok($utctime - $vmstime +$offset <= 10,"(time) UTC:$utctime VMS:$vmstime");
+  ok(abs($utctime - $vmstime + $offset) <= 10,"(time) UTC: $utctime VMS: $vmstime");
 
   $utcval = $utclocal[5] * 31536000 + $utclocal[7] * 86400 +
             $utclocal[2] * 3600     + $utclocal[1] * 60 + $utclocal[0];
   $vmsval = $vmslocal[5] * 31536000 + $vmslocal[7] * 86400 +
             $vmslocal[2] * 3600     + $vmslocal[1] * 60 + $vmslocal[0];
-  ok($vmsval - $utcval + $offset <= 10, "(localtime)");
+  ok(abs($vmsval - $utcval + $offset) <= 10, "(localtime) UTC: $utcval  VMS: 
$vmsval");
   print "# UTC: @utclocal\n# VMS: @vmslocal\n";
 
   $utcval = $utcgmtime[5] * 31536000 + $utcgmtime[7] * 86400 +
             $utcgmtime[2] * 3600     + $utcgmtime[1] * 60 + $utcgmtime[0];
   $vmsval = $vmsgmtime[5] * 31536000 + $vmsgmtime[7] * 86400 +
             $vmsgmtime[2] * 3600     + $vmsgmtime[1] * 60 + $vmsgmtime[0];
-  ok($vmsval - $utcval + $offset <= 10, "(gmtime)");
+  ok(abs($vmsval - $utcval + $offset) <= 10, "(gmtime) UTC: $utcval  VMS: $vmsval");
   print "# UTC: @utcgmtime\n# VMS: @vmsgmtime\n";
 
-  ok($vmsmtime - $utcmtime + $offset <= 10,"(stat) UTC: $utcmtime  VMS: $vmsmtime");
+  ok(abs($utcmtime - $vmsmtime + $offset) <= 10,"(stat) UTC: $utcmtime  VMS: 
$vmsmtime");
 }
 }
 

==== //depot/maint-5.8/perl/pod/perlhist.pod#2 (text) ====
Index: perl/pod/perlhist.pod
--- perl/pod/perlhist.pod#1~17645~      Fri Jul 19 12:29:57 2002
+++ perl/pod/perlhist.pod       Wed Mar 26 11:23:37 2003
@@ -73,6 +73,7 @@
 
           1.001..10     1988-Jan-30
           1.011..14     1988-Feb-02
+ Schwern  1.0.15        2002-Dec-18     Modernization
 
  Larry   2.000          1988-Jun-05
 
End of Patch.

Reply via email to