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

Commit 61f25bb

Browse files
committed
EUMM 8.35_07: fix AR_STATIC_ARGS to be arflags
With lto there's a linking problem without the lto plugin. Using D for deterministic builds should also be used. Fixes Win32CORE.a on cygwin.
1 parent d6f99ed commit 61f25bb

File tree

6 files changed

+22
-11
lines changed

6 files changed

+22
-11
lines changed

Makefile.SH

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ done
215215

216216
static_list=' '
217217
for f in $static_ext; do
218-
base=`echo "$f" | sed 's/.*\///'`
219-
static_list="$static_list lib/auto/$f/$base\$(LIB_EXT)"
218+
base=`echo "$f" | sed 's/.*\///'`
219+
static_list="$static_list lib/auto/$f/$base\$(LIB_EXT)"
220220
: Parallel makes reveal that we have some interdependencies
221221
this_target="lib/auto/$f/$base\$(LIB_EXT)"
222222
case $f in

dist/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue _sprintf562);
1414

1515
# If we make $VERSION an our variable parse_version() breaks
1616
use vars qw($VERSION);
17-
$VERSION = '8.35_06';
17+
$VERSION = '8.35_07';
1818
$VERSION =~ tr/_//d;
1919

2020
require ExtUtils::MM_Any;
@@ -405,7 +405,7 @@ sub constants {
405405

406406
for my $macro (qw(
407407
408-
AR_STATIC_ARGS DIRFILESEP DFSEP
408+
AR_STATIC_ARGS ARFLAGS DIRFILESEP DFSEP
409409
NAME NAME_SYM
410410
VERSION VERSION_MACRO VERSION_SYM DEFINE_VERSION
411411
XS_VERSION XS_VERSION_MACRO XS_DEFINE_VERSION
@@ -1864,7 +1864,8 @@ EOP
18641864
# }
18651865
# But I leave it as a placeholder
18661866

1867-
$self->{AR_STATIC_ARGS} ||= "cr";
1867+
$self->{AR_STATIC_ARGS} = $Config{arflags};
1868+
$self->{AR_STATIC_ARGS} ||= 'cr';
18681869

18691870
# These should never be needed
18701871
$self->{OBJ_EXT} ||= '.o';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ our %macro_dep; # whether a macro is a dependency
2929
use constant SILENT => (defined $ENV{MAKEFLAGS}
3030
and $ENV{MAKEFLAGS} =~ /\b(s|silent|quiet)\b/) ? 1 : 0;
3131

32-
our $VERSION = '8.35_06';
32+
our $VERSION = '8.35_07';
3333
$VERSION =~ tr/_//d;
3434

3535
# Emulate something resembling CVS $Revision$

dist/Module-CoreList/lib/Module/CoreList.pm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18338,7 +18338,10 @@ our %delta :const = (
1833818338
'B::Op_private' => '5.026005',
1833918339
'Module::CoreList' => '5.20190301c',
1834018340
'Module::CoreList::Utils'=> '5.20190301c',
18341-
'Storable' => '3.12_03',
18341+
'Cpanel::JSON::XS' => '4.09',
18342+
'ExtUtils::MakeMaker' => '8.35_07',
18343+
'ExtUtils::MM_Unix' => '8.35_07',
18344+
'Storable' => '3.12_04',
1834218345
}
1834318346
}
1834418347
);

pod/perlcdelta.pod

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ L<perl5262cdelta>, which describes differences between v5.26.1c and v5.26.2c.
1818

1919
=over 4
2020

21-
=item L<Storable> 1.12_03
21+
=item L<ExtUtils::MakeMaker> 8.35_07
22+
23+
Added C<-flto> support for static libs (need the lto plugin) and D for
24+
deterministic builds, using arflags for AR_STATIC_ARGS, not just 'cr'.
25+
26+
Fixed FULLPERL patch for cperl on Win32.
27+
28+
=item L<Storable> 1.12_04
2229

2330
Fix stacklimit security issues introduced in the p5p release [cperl #393].
2431
User limits must not be higher than the probed hard limits, when
@@ -45,7 +52,7 @@ Additionally, the following selected changes have been made:
4552

4653
=item *
4754

48-
C<Syntax error in (?[...]) in regex m/%s/> changed to
55+
C<Syntax error in (?[...]) in regex m/%s/> changed to
4956
C<Syntax error in (?[...]) in regex; marked by <-- HERE in m/%s/>
5057

5158
=item *

t/porting/customized.dat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ Encode cpan/Encode/t/Aliases.t 95bf948f5dbdd4f775904baf2111413b66a5944d
5656
ExtUtils::CBuilder dist/ExtUtils-CBuilder/t/00-have-compiler.t 9061ebec404019e812d03fa7227dd435d7a71046
5757
ExtUtils::CBuilder dist/ExtUtils-CBuilder/t/03-cplusplus.t 71a03fe898634486a5181ac32b6a98f03bb9a914
5858
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm a7ce3c6953c3f783dc99c967fb9a7dc32ac1edf7
59-
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 0904283eb89772208048b4f3130234fb0efa4bb3
59+
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm d464aea8ca0a7884421a6efd037d927f39892914
6060
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm 94141aecccee11d919c41312f1032dee2809793b
6161
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm 31f403a94633fbe1f52dfceb929805ffa3ca4c72
6262
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 2475c92bef4c81275cbe2f1929a03539633b72fa
63-
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm fccf81b620107d5a981ba0d0dccea282e5b3df05
63+
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 42f37f91c7433aaa2b5e38d85dd4b7e63391bc44
6464
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/t/basic.t c4d0d921785b91b6d958c372c430f52223acf035
6565
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm 371cdff1b2375017907cfbc9c8f4a31f5ad10582
6666
ExtUtils::MakeMaker dist/ExtUtils-MakeMaker/t/Liblist.t 9a3baf8a2c2281037f803b909d26e77a1bb099af

0 commit comments

Comments
 (0)