Change 14124 by ams@lustre on 2002/01/07 21:46:11
Subject: [PATCH] Last patch needed to get Perl5.7 to build natively on VOS
From: "Green, Paul" <[EMAIL PROTECTED]>
Date: Mon, 7 Jan 2002 16:59:38 -0500
Message-Id: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/ext/Errno/Errno_pm.PL#34 edit
.... //depot/perl/perl.h#433 edit
.... //depot/perl/t/TEST#69 edit
.... //depot/perl/t/test.pl#31 edit
.... //depot/perl/vos/vosish.h#8 edit
Differences ...
==== //depot/perl/ext/Errno/Errno_pm.PL#34 (text) ====
Index: perl/ext/Errno/Errno_pm.PL
--- perl/ext/Errno/Errno_pm.PL.~1~ Mon Jan 7 15:00:05 2002
+++ perl/ext/Errno/Errno_pm.PL Mon Jan 7 15:00:05 2002
@@ -123,6 +123,9 @@
# hidden in a special place
$file{'/boot/develop/headers/posix/errno.h'} = 1;
+ } elsif ($^O eq 'vos') {
+ # avoid problem where cpp returns non-POSIX pathnames
+ $file{'/system/include_library/errno.h'} = 1;
} else {
open(CPPI,"> errno.c") or
die "Cannot open errno.c";
==== //depot/perl/perl.h#433 (text) ====
Index: perl/perl.h
--- perl/perl.h.~1~ Mon Jan 7 15:00:05 2002
+++ perl/perl.h Mon Jan 7 15:00:05 2002
@@ -1789,7 +1789,11 @@
#endif
#if defined(__VOS__)
-# include "./vos/vosish.h"
+# ifdef __GNUC__
+# include "./vos/vosish.h"
+# else
+# include "vos/vosish.h"
+# endif
# define ISHISH "vos"
#endif
==== //depot/perl/t/TEST#69 (xtext) ====
Index: perl/t/TEST
--- perl/t/TEST.~1~ Mon Jan 7 15:00:05 2002
+++ perl/t/TEST Mon Jan 7 15:00:05 2002
@@ -30,7 +30,7 @@
chdir 't' if -f 't/TEST';
die "You need to run \"make test\" first to set things up.\n"
- unless -e 'perl' or -e 'perl.exe';
+ unless -e 'perl' or -e 'perl.exe' or -e 'perl.pm';
if ($ENV{PERL_3LOG}) { # Tru64 third(1) tool, see perlhack
unless (-x 'perl.third') {
==== //depot/perl/t/test.pl#31 (text) ====
Index: perl/t/test.pl
--- perl/t/test.pl.~1~ Mon Jan 7 15:00:05 2002
+++ perl/t/test.pl Mon Jan 7 15:00:05 2002
@@ -368,11 +368,13 @@
$Perl = File::Spec->catfile(File::Spec->curdir(), $perl);
}
}
-
- # Its like this. stat on Cygwin treats 'perl' to mean 'perl.exe'
- # but open does not. This can get confusing, so to be safe we
- # always put the .exe on the end on Cygwin.
- $Perl .= $exe if $^O eq 'cygwin' && $Perl !~ /\Q$exe\E$/;
+
+ # Build up the name of the executable file from the name of
+ # the command.
+
+ if ($Perl !~ /\Q$exe\E$/i) {
+ $Perl .= $exe;
+ }
warn "which_perl: cannot find $Perl from $^X" unless -f $Perl;
==== //depot/perl/vos/vosish.h#8 (text) ====
Index: perl/vos/vosish.h
--- perl/vos/vosish.h.~1~ Mon Jan 7 15:00:05 2002
+++ perl/vos/vosish.h Mon Jan 7 15:00:05 2002
@@ -1,4 +1,8 @@
+#ifdef __GNUC__
#include "../unixish.h"
+#else
+#include "unixish.h"
+#endif
/* The following declaration is an avoidance for posix-950. */
extern int ioctl (int fd, int request, ...);
End of Patch.
