Skip to content

Commit cd3021a

Browse files
author
Salve J. Nilsen
committed
Merge remote-tracking branch 'upstream/master' into sjn/relocatable-shebang-1
2 parents 072f732 + 4546fa6 commit cd3021a

Some content is hidden

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

53 files changed

+193
-89
lines changed

Changes

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
7.35_06 Thu Jul 19 20:30:55 BST 2018
2+
3+
Enhancements:
4+
- Override shebang with PERL_MM_SHEBANG=relocatable env var
5+
6+
Bug fixes:
7+
- Refactored Liblist::Kid tests, enabling UNIX testing
8+
9+
7.35_05 Tue Jul 10 09:44:25 BST 2018
10+
11+
Win32 fixes:
12+
- add Visual C parallel building support
13+
14+
7.35_04 Mon Jul 9 10:21:59 BST 2018
15+
16+
Bug fixes:
17+
- Fix manification on MSWin32
18+
19+
Doc fixes:
20+
- Mention manifypods target in FAQ for
21+
man creation on non-un*x OS
22+
123
7.35_03 Fri Apr 27 14:28:21 BST 2018
224

325
Enhancements:

MANIFEST

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,6 @@ t/lib/Test/Simple.pm
100100
t/lib/TieIn.pm
101101
t/lib/TieOut.pm
102102
t/Liblist.t
103-
t/liblist/win32/__test.lib
104-
't/liblist/win32/di r/dir_test.lib'
105-
t/liblist/win32/dir/dir_test.lib
106-
t/liblist/win32/double.lib
107-
t/liblist/win32/imp.dll.a
108-
t/liblist/win32/lib/CORE/c_test.lib
109-
t/liblist/win32/lib/CORE/double.lib
110-
t/liblist/win32/lib__test.lib
111-
t/liblist/win32/lib_test.lib
112-
t/liblist/win32/libpath/lp_test.lib
113-
t/liblist/win32/pl.lib
114-
't/liblist/win32/space lib.lib'
115-
t/liblist/win32/test.a.lib
116-
t/liblist/win32/test.lib
117-
t/liblist/win32/test.meep
118-
t/liblist/win32/test2.lib
119-
t/liblist/win32/vc/vctest.lib
120103
t/Liblist_Kid.t
121104
t/make.t
122105
t/MakeMaker_Parameters.t

lib/ExtUtils/Command.pm

Lines changed: 1 addition & 1 deletion
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.35_03';
10+
$VERSION = '7.35_06';
1111
$VERSION =~ tr/_//d;
1212

1313
my $Is_VMS = $^O eq 'VMS';

lib/ExtUtils/Command/MM.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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 = '7.35_03';
13+
our $VERSION = '7.35_06';
1414
$VERSION =~ tr/_//d;
1515

1616
my $Is_VMS = $^O eq 'VMS';

lib/ExtUtils/Liblist.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ExtUtils::Liblist;
22

33
use strict;
44

5-
our $VERSION = '7.35_03';
5+
our $VERSION = '7.35_06';
66
$VERSION =~ tr/_//d;
77

88
use File::Spec;

lib/ExtUtils/Liblist/Kid.pm

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use 5.006;
1111

1212
use strict;
1313
use warnings;
14-
our $VERSION = '7.35_03';
14+
our $VERSION = '7.35_06';
1515
$VERSION =~ tr/_//d;
1616

1717
use ExtUtils::MakeMaker::Config;
@@ -49,8 +49,10 @@ sub _unix_os2_ext {
4949
# $potential_libs
5050
# this is a rewrite of Andy Dougherty's extliblist in perl
5151

52+
require Text::ParseWords;
53+
5254
my ( @searchpath ); # from "-L/path" entries in $potential_libs
53-
my ( @libpath ) = split " ", $Config{'libpth'} || '';
55+
my ( @libpath ) = Text::ParseWords::quotewords( '\s+', 0, $Config{'libpth'} || '' );
5456
my ( @ldloadlibs, @bsloadlibs, @extralibs, @ld_run_path, %ld_run_path_seen );
5557
my ( @libs, %libs_seen );
5658
my ( $fullname, @fullname );
@@ -63,7 +65,7 @@ sub _unix_os2_ext {
6365
$potential_libs =~ s/(^|\s)(-F)\s*(\S+)/$1-Wl,$2 -Wl,$3/g;
6466
}
6567

66-
foreach my $thislib ( split ' ', $potential_libs ) {
68+
foreach my $thislib ( Text::ParseWords::quotewords( '\s+', 0, $potential_libs) ) {
6769
my ( $custom_name ) = '';
6870

6971
# Handle possible linker path arguments.
@@ -88,6 +90,7 @@ sub _unix_os2_ext {
8890
$thislib = $self->catdir( $pwd, $thislib );
8991
}
9092
push( @searchpath, $thislib );
93+
$thislib = qq{"$thislib"} if $thislib =~ / /; # protect spaces if there
9194
push( @extralibs, "$ptype$thislib" );
9295
push( @ldloadlibs, "$rtype$thislib" );
9396
next;

lib/ExtUtils/MM.pm

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

6-
our $VERSION = '7.35_03';
6+
our $VERSION = '7.35_06';
77
$VERSION =~ tr/_//d;
88

99
require ExtUtils::Liblist;

lib/ExtUtils/MM_AIX.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ExtUtils::MM_AIX;
22

33
use strict;
4-
our $VERSION = '7.35_03';
4+
our $VERSION = '7.35_06';
55
$VERSION =~ tr/_//d;
66

77
use ExtUtils::MakeMaker::Config;

lib/ExtUtils/MM_Any.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ExtUtils::MM_Any;
22

33
use strict;
4-
our $VERSION = '7.35_03';
4+
our $VERSION = '7.35_06';
55
$VERSION =~ tr/_//d;
66

77
use Carp;

lib/ExtUtils/MM_BeOS.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require ExtUtils::MM_Any;
2626
require ExtUtils::MM_Unix;
2727

2828
our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
29-
our $VERSION = '7.35_03';
29+
our $VERSION = '7.35_06';
3030
$VERSION =~ tr/_//d;
3131

3232

0 commit comments

Comments
 (0)