[6565f5]: perl / msys2-perl.patch  Maximize  Restore  History

Download this file

132 lines (121 with data), 5.8 kB

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
diff -Naur perl-5.14.4/configpm ../perl-5.14.4/configpm
--- perl-5.14.4/configpm 2012-12-19 12:25:23.000000000 +0000
+++ ../perl-5.14.4/configpm 2013-03-24 11:26:08.205078200 +0000
@@ -203,7 +203,7 @@
print " $date\n" if defined $date;
my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %ENV;
- push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $^O eq 'cygwin' and $ENV{CYGWIN};
+ push @env, "MSYS=\"$ENV{MSYS}\"" if $^O eq 'cygwin' and $ENV{MSYS};
if (@env) {
print " \%ENV:\n";
diff -Naur perl-5.14.4/Configure ../perl-5.14.4/Configure
--- perl-5.14.4/Configure 2013-03-24 09:31:31.509765700 +0000
+++ ../perl-5.14.4/Configure 2013-03-24 11:26:08.220703200 +0000
@@ -3243,6 +3243,9 @@
cygwin*) osname=cygwin
osvers="$3"
;;
+ msys*) osname=cygwin
+ osvers="$3"
+ ;;
*dc.osx) osname=dcosx
osvers="$3"
;;
@@ -8247,10 +8250,10 @@
dflt=libperl.$so
;;
cygwin*) # ld links now against the dll directly
- majmin="cygperl5_${patchlevel}_${subversion}.${so}"
+ majmin="msys-perl5_${patchlevel}_${subversion}.${so}"
majonly=`echo $patchlevel $subversion |
$awk '{printf "%03d%03d", $1, $2}'`
- majonly=cygperl5.$majonly.$so
+ majonly=msys-perl5.$majonly.$so
dflt=$majmin
;;
*) # Try to guess based on whether libc has major.minor.
diff -Naur perl-5.14.4/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm ../perl-5.14.4/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm
--- perl-5.14.4/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm 2012-12-19 12:25:23.000000000 +0000
+++ ../perl-5.14.4/cpan/CPANPLUS/lib/CPANPLUS/Internals/Report.pm 2013-03-24 11:26:08.236328200 +0000
@@ -132,7 +132,7 @@
{
'grade' => 'FAIL',
'dist' => 'CPANPLUS-0.042',
- 'platform' => 'cygwin-multi-64int',
+ 'platform' => 'msys-multi-64int',
'details' => 'http://nntp.x.perl.org/group/perl.cpan.testers/99371'
...
},
diff -Naur perl-5.14.4/Cross/Makefile-cross-SH ../perl-5.14.4/Cross/Makefile-cross-SH
--- perl-5.14.4/Cross/Makefile-cross-SH 2012-12-19 12:25:23.000000000 +0000
+++ ../perl-5.14.4/Cross/Makefile-cross-SH 2013-03-24 11:26:08.236328200 +0000
@@ -959,7 +959,7 @@
-rm -f perl.third lib*.so.perl.third perl.3log t/perl.third t/perl.3log
-rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs
-rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok
- -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
+ -rm -f cygwin.c libperl*.def libperl*.dll msys-perl*.dll *.exe.stackdump
-rm -f perl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* microperl
-rm -f config.over
diff -Naur perl-5.14.4/ext/DynaLoader/DynaLoader_pm.PL ../perl-5.14.4/ext/DynaLoader/DynaLoader_pm.PL
--- perl-5.14.4/ext/DynaLoader/DynaLoader_pm.PL 2012-12-19 12:25:24.000000000 +0000
+++ ../perl-5.14.4/ext/DynaLoader/DynaLoader_pm.PL 2013-03-24 11:26:08.236328200 +0000
@@ -438,7 +438,7 @@
push(@names,"$_.$dl_dlext") unless m/\.$dl_dlext$/o;
push(@names,"$_.$dl_so") unless m/\.$dl_so$/o;
<<$^O-eq-cygwin>>
- push(@names,"cyg$_.$dl_so") unless m:/:;
+ push(@names,"msys-$_.$dl_so") unless m:/:;
<</$^O-eq-cygwin>>
push(@names,"lib$_.$dl_so") unless m:/:;
push(@names,"$_.a") if !m/\.a$/ and $dlsrc eq "dl_dld.xs";
diff -Naur perl-5.14.4/t/io/fs.t ../perl-5.14.4/t/io/fs.t
--- perl-5.14.4/t/io/fs.t 2012-12-19 12:25:24.000000000 +0000
+++ ../perl-5.14.4/t/io/fs.t 2013-03-24 11:26:08.251953200 +0000
@@ -44,7 +44,7 @@
$needs_fh_reopen = 1 if (defined &Win32::IsWin95 && Win32::IsWin95());
my $skip_mode_checks =
- $^O eq 'cygwin' && $ENV{CYGWIN} !~ /ntsec/;
+ $^O eq 'cygwin' && $ENV{MSYS} !~ /ntsec/;
plan tests => 51;
@@ -413,7 +413,7 @@
# check if rename() can be used to just change case of filename
SKIP: {
skip "Works in Cygwin only if check_case is set to relaxed", 1
- if ($ENV{'CYGWIN'} && ($ENV{'CYGWIN'} =~ /check_case:(?:adjust|strict)/));
+ if ($ENV{'MSYS'} && ($ENV{'MSYS'} =~ /check_case:(?:adjust|strict)/));
chdir "./$tmpdir";
open(FH,'>x') || die "Can't create x";
diff -Naur perl-5.14.4/t/op/groups.t ../perl-5.14.4/t/op/groups.t
--- perl-5.14.4/t/op/groups.t 2012-12-19 12:25:24.000000000 +0000
+++ ../perl-5.14.4/t/op/groups.t 2013-03-24 11:29:19.166992200 +0000
@@ -284,7 +284,7 @@
# Test if this is Cygwin
sub cygwin_nt {
- return $Config::Config{myuname} =~ /^cygwin_nt/i;
+ return $Config::Config{myuname} =~ /^msys_nt/i;
}
# Get perl's supplementary groups and the number of times each gid
diff -Naur perl-5.14.4/t/op/stat.t ../perl-5.14.4/t/op/stat.t
--- perl-5.14.4/t/op/stat.t 2012-12-19 12:25:24.000000000 +0000
+++ ../perl-5.14.4/t/op/stat.t 2013-03-24 11:29:40.479492200 +0000
@@ -107,7 +107,7 @@
SKIP: {
skip "No link count", 1 if $Config{dont_use_nlink};
skip "Cygwin9X fakes hard links by copying", 1
- if $Config{myuname} =~ /^cygwin_(?:9\d|me)\b/i;
+ if $Config{myuname} =~ /^msys_(?:9\d|me)\b/i;
is($nlink, 2, 'Link count on hard linked file' );
}
diff -Naur perl-5.14.4/utils/perlbug.PL ../perl-5.14.4/utils/perlbug.PL
--- perl-5.14.4/utils/perlbug.PL 2012-12-19 12:25:24.000000000 +0000
+++ ../perl-5.14.4/utils/perlbug.PL 2013-03-24 11:26:08.251953200 +0000
@@ -763,7 +763,7 @@
my @env =
qw(PATH LD_LIBRARY_PATH LANG PERL_BADLANG SHELL HOME LOGDIR LANGUAGE);
push @env, $Config{ldlibpthname} if $Config{ldlibpthname} ne '';
- push @env, grep /^(?:PERL|LC_|LANG|CYGWIN)/, keys %ENV;
+ push @env, grep /^(?:PERL|LC_|LANG|MSYS)/, keys %ENV;
my %env;
@env{@env} = @env;
for my $env (sort keys %env) {

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks