1 |
dilfridge 15/02/25 23:08:03 |
2 |
|
3 |
Added: 7.04-delete_packlist_podlocal.patch |
4 |
Log: |
5 |
Version bump, needed for dev-perl/Inline-C |
6 |
|
7 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 perl-core/ExtUtils-MakeMaker/files/7.04-delete_packlist_podlocal.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/perl-core/ExtUtils-MakeMaker/files/7.04-delete_packlist_podlocal.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/perl-core/ExtUtils-MakeMaker/files/7.04-delete_packlist_podlocal.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: 7.04-delete_packlist_podlocal.patch |
16 |
=================================================================== |
17 |
diff -ruN ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MM_Unix.pm ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm |
18 |
--- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MM_Unix.pm 2014-12-02 13:44:33.000000000 +0100 |
19 |
+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm 2015-02-25 23:54:03.373862321 +0100 |
20 |
@@ -1606,6 +1606,16 @@ |
21 |
$self->{FULLEXT} = $self->catdir(split /::/, $self->{NAME}); |
22 |
|
23 |
|
24 |
+ # Workaround for https://bugs.gentoo.org/show_bug.cgi?id=221179 |
25 |
+ if (!exists($self->{NO_PERLLOCAL})) { |
26 |
+ $self->{NO_PERLLOCAL} = 1; |
27 |
+ } |
28 |
+ |
29 |
+ if (!exists($self->{NO_PACKLIST})) { |
30 |
+ $self->{NO_PACKLIST} = 1; |
31 |
+ } |
32 |
+ |
33 |
+ |
34 |
# Copied from DynaLoader: |
35 |
|
36 |
my(@modparts) = split(/::/,$self->{NAME}); |
37 |
diff -ruN ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MakeMaker.pm ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm |
38 |
--- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MakeMaker.pm 2014-12-02 13:44:33.000000000 +0100 |
39 |
+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm 2015-02-25 23:54:03.373862321 +0100 |
40 |
@@ -2348,13 +2348,13 @@ |
41 |
When true, suppresses the generation of MYMETA.yml and MYMETA.json module |
42 |
meta-data files during 'perl Makefile.PL'. |
43 |
|
44 |
-Defaults to false. |
45 |
+Defaults to true. |
46 |
|
47 |
=item NO_PACKLIST |
48 |
|
49 |
When true, suppresses the writing of C<packlist> files for installs. |
50 |
|
51 |
-Defaults to false. |
52 |
+Defaults to true. |
53 |
|
54 |
=item NO_PERLLOCAL |
55 |
|
56 |
diff -ruN ExtUtils-MakeMaker-7.04.orig/t/INSTALL_BASE.t ExtUtils-MakeMaker-7.04/t/INSTALL_BASE.t |
57 |
--- ExtUtils-MakeMaker-7.04.orig/t/INSTALL_BASE.t 2014-11-11 14:50:52.000000000 +0100 |
58 |
+++ ExtUtils-MakeMaker-7.04/t/INSTALL_BASE.t 2015-02-25 23:59:00.383878929 +0100 |
59 |
@@ -42,7 +42,7 @@ |
60 |
ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy") || diag("chdir failed; $!"); |
61 |
|
62 |
for my $instdir (@INSTDIRS) { |
63 |
- my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=$instdir"}); |
64 |
+ my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=$instdir" NO_PERLLOCAL=0 NO_PACKLIST=0}); |
65 |
|
66 |
cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || |
67 |
diag(@mpl_out); |
68 |
diff -ruN ExtUtils-MakeMaker-7.04.orig/t/basic.t ExtUtils-MakeMaker-7.04/t/basic.t |
69 |
--- ExtUtils-MakeMaker-7.04.orig/t/basic.t 2014-11-11 14:50:52.000000000 +0100 |
70 |
+++ ExtUtils-MakeMaker-7.04/t/basic.t 2015-02-25 23:56:51.161871703 +0100 |
71 |
@@ -59,7 +59,7 @@ |
72 |
|
73 |
sub extrachar { $] > 5.008 && !$ENV{PERL_CORE} ? utf8::decode(my $c='ลก') : 's' } |
74 |
my $DUMMYINST = '../dummy-in'.extrachar().'tall'; |
75 |
-my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST"}); |
76 |
+my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST" NO_PERLLOCAL=0 NO_PACKLIST=0}); |
77 |
END { rmtree $DUMMYINST; } |
78 |
|
79 |
cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || |