Skip to content
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Commit 241fd94

Browse files
rurbanrurban
committed
EUMM: Update to 8.30_04
See https://github.com/rurban/ExtUtils-MakeMaker/tree/cperl
1 parent 26337c1 commit 241fd94

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+3848
-2915
lines changed

‎MANIFEST‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3066,6 +3066,8 @@ dist/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm MakeMaker user override class
30663066
dist/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm Fixes up @INC to use just-built extension
30673067
dist/ExtUtils-MakeMaker/t/00compile.t See if MakeMaker modules compile
30683068
dist/ExtUtils-MakeMaker/t/01perl_bugs.t
3069+
dist/ExtUtils-MakeMaker/t/02-xsdynamic.t
3070+
dist/ExtUtils-MakeMaker/t/03-xsstatic.t
30693071
dist/ExtUtils-MakeMaker/t/arch_check.t Test MakeMaker's arch_check()
30703072
dist/ExtUtils-MakeMaker/t/backwards.t Check MakeMaker's backwards compatibility
30713073
dist/ExtUtils-MakeMaker/t/basic.t See if MakeMaker can build a module
@@ -3087,12 +3089,6 @@ dist/ExtUtils-MakeMaker/t/installed_file.t Test for ExtUtils::MakeMaker
30873089
dist/ExtUtils-MakeMaker/t/is_of_type.t Test for ExtUtils::MakeMaker
30883090
dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm MakeMaker test utilities
30893091
dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm MakeMaker test utilities
3090-
dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/MPV.pm MakeMaker test utilities
3091-
dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm MakeMaker test utilities
3092-
dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm MakeMaker test utilities
3093-
dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm MakeMaker test utilities
3094-
dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/SAS.pm MakeMaker test utilities
3095-
dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Unicode.pm
30963092
dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm MakeMaker test utilities
30973093
dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm MakeMaker test utilities
30983094
dist/ExtUtils-MakeMaker/t/lib/TieIn.pm Testing library for dummy input handles
@@ -3119,6 +3115,7 @@ dist/ExtUtils-MakeMaker/t/MM_Unix.t See if ExtUtils::MM_UNIX works
31193115
dist/ExtUtils-MakeMaker/t/MM_VMS.t See if ExtUtils::MM_VMS works
31203116
dist/ExtUtils-MakeMaker/t/MM_Win32.t See if ExtUtils::MM_Win32 works
31213117
dist/ExtUtils-MakeMaker/t/oneliner.t See if MM can generate perl one-liners
3118+
dist/ExtUtils-MakeMaker/t/os_unsupported.t
31223119
dist/ExtUtils-MakeMaker/t/parse_abstract.t See if parse_abstract works
31233120
dist/ExtUtils-MakeMaker/t/parse_version.t See if parse_version works
31243121
dist/ExtUtils-MakeMaker/t/PL_FILES.t Test PL_FILES in MakeMaker
@@ -3144,7 +3141,6 @@ dist/ExtUtils-MakeMaker/t/VERSION_FROM.t See if MakeMaker's VERSION_FROM works
31443141
dist/ExtUtils-MakeMaker/t/vstrings.t
31453142
dist/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t See if WriteEmptyMakefile works
31463143
dist/ExtUtils-MakeMaker/t/writemakefile_args.t See if WriteMakefile works
3147-
dist/ExtUtils-MakeMaker/t/xs.t Part of MakeMaker's test suite
31483144
dist/ExtUtils-ParseXS/Changes ExtUtils::ParseXS change log
31493145
dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm converts Perl XS code into C code
31503146
dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pod ExtUtils::ParseXS documentation

‎Porting/Maintainers.pl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ package Maintainers;
654654
},
655655

656656
'ExtUtils::MakeMaker' => {
657-
'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.04.tar.gz',
657+
'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.30.tar.gz',
658658
'FILES' => q[dist/ExtUtils-MakeMaker],
659659
'EXCLUDED' => [
660660
qr{^t/lib/Test/},
@@ -673,14 +673,15 @@ package Maintainers;
673673
'CUSTOMIZED' =>
674674
[ qw[ lib/ExtUtils/MM_Any.pm
675675
lib/ExtUtils/MM_Unix.pm
676-
lib/ExtUtils/Command/MM.pm
676+
lib/ExtUtils/MM.pm
677677
lib/ExtUtils/MakeMaker.pm
678678
lib/ExtUtils/Mkbootstrap.pm
679679
lib/ExtUtils/Liblist/Kid.pm
680680
t/basic.t
681681
t/Liblist.t
682682
t/Mkbootstrap.t
683683
t/pm_to_blib.t
684+
t/pod2man.t
684685
t/prereq.t
685686
t/vstrings.t ],
686687
# Not yet submitted

‎dist/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
77
@ISA = qw(Exporter);
88
@EXPORT = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod
99
dos2unix);
10-
$VERSION = '7.10';
10+
$VERSION = '7.30';
1111
$VERSION = eval $VERSION;
1212

1313
my $Is_VMS = $^O eq 'VMS';
@@ -20,7 +20,10 @@ if( $Is_VMS ) {
2020
my $vms_efs;
2121
my $vms_case;
2222

23-
if (eval { local $SIG{__DIE__}; require VMS::Feature; }) {
23+
if (eval { local $SIG{__DIE__};
24+
local @INC = @INC;
25+
pop @INC if $INC[-1] eq '.';
26+
require VMS::Feature; }) {
2427
$vms_unix_rpt = VMS::Feature::current("filename_unix_report");
2528
$vms_efs = VMS::Feature::current("efs_charset");
2629
$vms_case = VMS::Feature::current("efs_case_preserve");
@@ -347,6 +350,7 @@ sub dos2unix {
347350
open ORIG, $_ or do { warn "dos2unix can't open $_: $!"; return };
348351
open TEMP, ">$temp" or
349352
do { warn "dos2unix can't create .dos2unix_tmp: $!"; return };
353+
binmode ORIG; binmode TEMP;
350354
while (my $line = <ORIG>) {
351355
$line =~ s/\015\012/\012/g;
352356
print TEMP $line;

‎dist/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,20 @@ our @ISA = qw(Exporter);
1010

1111
our @EXPORT = qw(test_harness pod2man perllocal_install uninstall
1212
warn_if_old_packlist test_s cp_nonempty);
13-
our $VERSION = '8.04_04';
13+
our $VERSION = '7.30';
14+
$VERSION = eval $VERSION;
1415

1516
my $Is_VMS = $^O eq 'VMS';
1617

17-
eval { require Time::HiRes; die unless Time::HiRes->can("stat"); };
18-
*mtime = $@ ?
19-
sub { [ stat($_[0])]->[9] } :
20-
sub { [Time::HiRes::stat($_[0])]->[9] } ;
18+
sub mtime {
19+
no warnings 'redefine';
20+
local $@;
21+
*mtime = (eval { require Time::HiRes } && defined &Time::HiRes::stat)
22+
? sub { (Time::HiRes::stat($_[0]))[9] }
23+
: sub { ( stat($_[0]))[9] }
24+
;
25+
goto &mtime;
26+
}
2127

2228
=head1 NAME
2329
@@ -215,8 +221,9 @@ sub perllocal_install {
215221
: @ARGV;
216222
217223
my $pod;
218-
$pod = sprintf <<POD, scalar localtime;
219-
=head2 %s: C<$type> L<$name|$name>
224+
my $time = gmtime($ENV{SOURCE_DATE_EPOCH} || time);
225+
$pod = sprintf <<'POD', scalar($time), $type, $name, $name;
226+
=head2 %s: C<%s> L<%s|%s>
220227
221228
=over 4
222229

‎dist/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package ExtUtils::Liblist;
22

33
use strict;
44

5-
our $VERSION = '8.04_03';
5+
our $VERSION = '7.30';
6+
$VERSION = eval $VERSION;
67

78
use File::Spec;
89
require ExtUtils::Liblist::Kid;
@@ -16,9 +17,9 @@ sub ext {
1617
sub lsdir {
1718
shift;
1819
my $rex = qr/$_[1]/;
19-
opendir DIR, $_[0];
20-
my @out = grep /$rex/, readdir DIR;
21-
closedir DIR;
20+
opendir my $dir_fh, $_[0];
21+
my @out = grep /$rex/, readdir $dir_fh;
22+
closedir $dir_fh;
2223
return @out;
2324
}
2425

‎dist/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ use 5.006;
1111

1212
use strict;
1313
use warnings;
14-
our $VERSION = '8.04_06';
14+
our $VERSION = '8.30_06';
15+
$VERSION = eval $VERSION;
1516

1617
use ExtUtils::MakeMaker::Config;
1718
use Cwd 'cwd';

‎dist/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ package ExtUtils::MM;
33
use strict;
44
use ExtUtils::MakeMaker::Config;
55

6-
our $VERSION = '8.04_04';
6+
our $VERSION = '8.30_04';
7+
$VERSION = eval $VERSION;
78

89
require ExtUtils::Liblist;
910
require ExtUtils::MakeMaker;

‎dist/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package ExtUtils::MM_AIX;
22

33
use strict;
4-
our $VERSION = '8.04_04';
4+
our $VERSION = '7.30';
5+
$VERSION = eval $VERSION;
56

7+
use ExtUtils::MakeMaker::Config;
68
require ExtUtils::MM_Unix;
79
our @ISA = qw(ExtUtils::MM_Unix);
810

9-
use ExtUtils::MakeMaker qw(neatvalue);
10-
11-
1211
=head1 NAME
1312
1413
ExtUtils::MM_AIX - AIX specific subclass of ExtUtils::MM_Unix
@@ -35,35 +34,34 @@ Define DL_FUNCS and DL_VARS and write the *.exp files.
3534

3635
sub dlsyms {
3736
my($self,%attribs) = @_;
37+
return '' unless $self->needs_linking;
38+
join "\n", $self->xs_dlsyms_iterator(\%attribs);
39+
}
3840

39-
return '' unless $self->needs_linking();
40-
41-
my($funcs) = $attribs{DL_FUNCS} || $self->{DL_FUNCS} || {};
42-
my($vars) = $attribs{DL_VARS} || $self->{DL_VARS} || [];
43-
my($funclist) = $attribs{FUNCLIST} || $self->{FUNCLIST} || [];
44-
my(@m);
45-
46-
push(@m,"
47-
dynamic :: $self->{BASEEXT}.exp
48-
49-
") unless $self->{SKIPHASH}{'dynamic'}; # dynamic and static are subs, so...
41+
=head3 xs_dlsyms_ext
5042
51-
push(@m,"
52-
static :: $self->{BASEEXT}.exp
43+
On AIX, is C<.exp>.
5344
54-
") unless $self->{SKIPHASH}{'static'}; # we avoid a warning if we tick them
45+
=cut
5546

56-
push(@m,"
57-
$self->{BASEEXT}.exp: Makefile.PL
58-
",' $(PERLRUN) -e \'use ExtUtils::Mksymlists; \\
59-
Mksymlists("NAME" => "',$self->{NAME},'", "DL_FUNCS" => ',
60-
neatvalue($funcs), ', "FUNCLIST" => ', neatvalue($funclist),
61-
', "DL_VARS" => ', neatvalue($vars), ');\'
62-
');
47+
sub xs_dlsyms_ext {
48+
'.exp';
49+
}
6350

64-
join('',@m);
51+
sub xs_dlsyms_arg {
52+
my($self, $file) = @_;
53+
return qq{-bE:${file}};
6554
}
6655

56+
sub init_others {
57+
my $self = shift;
58+
$self->SUPER::init_others;
59+
# perl "hints" add -bE:$(BASEEXT).exp to LDDLFLAGS. strip that out
60+
# so right value can be added by xs_make_dynamic_lib to work for XSMULTI
61+
$self->{LDDLFLAGS} ||= $Config{lddlflags};
62+
$self->{LDDLFLAGS} =~ s#(\s*)\S*\Q$(BASEEXT)\E\S*(\s*)#$1$2#;
63+
return;
64+
}
6765

6866
=head1 AUTHOR
6967

0 commit comments

Comments
 (0)