diff options
| author |   afresh1 <afresh1@openbsd.org> | 2019-02-13 21:15:00 +0000 |
|---|---|---|
| committer | afresh1 <afresh1@openbsd.org> | 2019-02-13 21:15:00 +0000 |
| commit | 9f11ffb7133c203312a01e4b986886bc88c7d74b (patch) | |
| tree | 6618511204c614b20256e4ef9dea39a7b311d638 /gnu/usr.bin/perl/lib/ExtUtils | |
| parent | Import perl-5.28.1 (diff) | |
| download | wireguard-openbsd-9f11ffb7133c203312a01e4b986886bc88c7d74b.tar.xz wireguard-openbsd-9f11ffb7133c203312a01e4b986886bc88c7d74b.zip | |
Fix merge issues, remove excess files - match perl-5.28.1 dist
looking good sthen@, Great! bluhm@
Diffstat (limited to 'gnu/usr.bin/perl/lib/ExtUtils')
| -rw-r--r-- | gnu/usr.bin/perl/lib/ExtUtils/Embed.pm | 17 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/lib/ExtUtils/typemap | 12 |
2 files changed, 15 insertions, 14 deletions
diff --git a/gnu/usr.bin/perl/lib/ExtUtils/Embed.pm b/gnu/usr.bin/perl/lib/ExtUtils/Embed.pm index 9305b5dc133..e75e41f8c48 100644 --- a/gnu/usr.bin/perl/lib/ExtUtils/Embed.pm +++ b/gnu/usr.bin/perl/lib/ExtUtils/Embed.pm @@ -3,22 +3,19 @@ require Exporter; use Config; require File::Spec; -use vars qw(@ISA @EXPORT $VERSION - @Extensions $Verbose $lib_ext - $opt_o $opt_s - ); +our ( @Extensions, $opt_o, $opt_s ); use strict; # This is not a dual-life module, so no need for development version numbers -$VERSION = '1.33'; +our $VERSION = '1.35'; -@ISA = qw(Exporter); -@EXPORT = qw(&xsinit &ldopts +our @ISA = qw(Exporter); +our @EXPORT = qw(&xsinit &ldopts &ccopts &ccflags &ccdlflags &perl_inc &xsi_header &xsi_protos &xsi_body); -$Verbose = 0; -$lib_ext = $Config{lib_ext} || '.a'; +our $Verbose = 0; +our $lib_ext = $Config{lib_ext} || '.a'; sub is_cmd { $0 eq '-e' } @@ -199,7 +196,7 @@ sub ldopts { push @archives, $archive; if(-e ($extra = File::Spec->catdir($_,"auto",$root,"extralibs.ld"))) { local(*FH); - if(open(FH, $extra)) { + if(open(FH, '<', $extra)) { my($libs) = <FH>; chomp $libs; push @potential_libs, split /\s+/, $libs; } diff --git a/gnu/usr.bin/perl/lib/ExtUtils/typemap b/gnu/usr.bin/perl/lib/ExtUtils/typemap index 4bfba95e9e0..db700b75bf6 100644 --- a/gnu/usr.bin/perl/lib/ExtUtils/typemap +++ b/gnu/usr.bin/perl/lib/ExtUtils/typemap @@ -398,8 +398,9 @@ T_ARRAY } T_STDIO { - GV *gv = newGVgen("$Package"); + GV *gv = (GV *)sv_newmortal(); PerlIO *fp = PerlIO_importFILE($var,0); + gv_init_pvn(gv, gv_stashpvs("$Package",1),"__ANONIO__",10,0); if ( fp && do_open(gv, "+<&", 3, FALSE, 0, 0, fp) ) { SV *rv = newRV_inc((SV*)gv); rv = sv_bless(rv, GvSTASH(gv)); @@ -411,7 +412,8 @@ T_STDIO } T_IN { - GV *gv = newGVgen("$Package"); + GV *gv = (GV *)sv_newmortal(); + gv_init_pvn(gv, gv_stashpvs("$Package",1),"__ANONIO__",10,0); if ( do_open(gv, "<&", 2, FALSE, 0, 0, $var) ) { SV *rv = newRV_inc((SV*)gv); rv = sv_bless(rv, GvSTASH(gv)); @@ -423,7 +425,8 @@ T_IN } T_INOUT { - GV *gv = newGVgen("$Package"); + GV *gv = (GV *)sv_newmortal(); + gv_init_pvn(gv, gv_stashpvs("$Package",1),"__ANONIO__",10,0); if ( do_open(gv, "+<&", 3, FALSE, 0, 0, $var) ) { SV *rv = newRV_inc((SV*)gv); rv = sv_bless(rv, GvSTASH(gv)); @@ -435,7 +438,8 @@ T_INOUT } T_OUT { - GV *gv = newGVgen("$Package"); + GV *gv = (GV *)sv_newmortal(); + gv_init_pvn(gv, gv_stashpvs("$Package",1),"__ANONIO__",10,0); if ( do_open(gv, "+>&", 3, FALSE, 0, 0, $var) ) { SV *rv = newRV_inc((SV*)gv); rv = sv_bless(rv, GvSTASH(gv)); |