develooper Front page | perl.perl5.changes | Postings from November 2010

[perl.git] branch blead, updated. v5.13.7-124-ga983b67

From:
Craig A. Berry
Date:
November 26, 2010 16:41
Subject:
[perl.git] branch blead, updated. v5.13.7-124-ga983b67
Message ID:
E1PM8qq-0000AN-2c@camel.ams6.corp.booking.com
In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/a983b67a695e2cb334b10a966f2d8bc70d044303?hp=8b47453d44c563ee3090c84630e0eea428f30e97>

- Log -----------------------------------------------------------------
commit a983b67a695e2cb334b10a966f2d8bc70d044303
Author: Craig A. Berry <craigberry@mac.com>
Date:   Fri Nov 26 18:33:54 2010 -0600

    Skip t/porting/FindExt.t on VMS.
    
    win32::FindExt doesn't work on VMS, but it's only intended to work
    on Windows, so there's not much reason to port it or to test it.

M	t/porting/FindExt.t

commit 4edfaa8809ab489b9ce1c7936973edc2c80216db
Author: Craig A. Berry <craigberry@mac.com>
Date:   Fri Nov 26 18:29:42 2010 -0600

    Fix Time::HiRes probes on VMS.
    
    We have not been correctly building this on VMS since the location
    was changed in core because we have not been able to loate include
    files.  This mirrors the upstream patch at:
    
    https://rt.cpan.org/Ticket/Display.html?id=63363

M	cpan/Time-HiRes/Makefile.PL
-----------------------------------------------------------------------

Summary of changes:
 cpan/Time-HiRes/Makefile.PL |   10 +---------
 t/porting/FindExt.t         |    4 ++++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/cpan/Time-HiRes/Makefile.PL b/cpan/Time-HiRes/Makefile.PL
index 2b9257a..9436f0c 100644
--- a/cpan/Time-HiRes/Makefile.PL
+++ b/cpan/Time-HiRes/Makefile.PL
@@ -118,15 +118,7 @@ __EOD__
 	my $ccflags = $Config{'ccflags'} . ' ' . "-I$COREincdir";
 
 	if ($^O eq 'VMS') {
-	    if ($ENV{PERL_CORE}) {
-		# Fragile if the extensions change hierarchy within
-		# the Perl core but this should do for now.
-                $cccmd = "$Config{'cc'} /include=([---]) $tmp.c";
-	    } else {
-		my $perl_core = $Config{'installarchlib'};
-		$perl_core =~ s/\]$/.CORE]/;
-                $cccmd = "$Config{'cc'} /include=(perl_root:[000000],$perl_core) $tmp.c";
-	    }
+            $cccmd = "$Config{'cc'} /include=($COREincdir) $tmp.c";
         }
 
         if ($args{silent} || !$VERBOSE) {
diff --git a/t/porting/FindExt.t b/t/porting/FindExt.t
index a877f8b..923211d 100644
--- a/t/porting/FindExt.t
+++ b/t/porting/FindExt.t
@@ -1,6 +1,10 @@
 #!../miniperl -w
 
 BEGIN {
+    if ($^O eq 'VMS') {
+        print "1..0 # FindExt not portable.\n";
+        exit 0;
+    }
     @INC = qw(../win32 ../lib);
     require './test.pl';
 }

--
Perl5 Master Repository



nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About