| 1 |
civil 13/11/25 18:09:01 |
| 2 |
|
| 3 |
Added: 6.82-delete_packlist_podlocal.patch |
| 4 |
Log: |
| 5 |
Add new version of patch. |
| 6 |
Fixes #484294 |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xA832680F) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 perl-core/ExtUtils-MakeMaker/files/6.82-delete_packlist_podlocal.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/perl-core/ExtUtils-MakeMaker/files/6.82-delete_packlist_podlocal.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/perl-core/ExtUtils-MakeMaker/files/6.82-delete_packlist_podlocal.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 6.82-delete_packlist_podlocal.patch |
| 17 |
=================================================================== |
| 18 |
--- lib/ExtUtils/MakeMaker.pm.bak 2013-11-25 20:48:18.119741749 +0400 |
| 19 |
+++ lib/ExtUtils/MakeMaker.pm 2013-11-25 20:49:26.798740829 +0400 |
| 20 |
@@ -2246,13 +2246,13 @@ |
| 21 |
When true, suppresses the generation of MYMETA.yml and MYMETA.json module |
| 22 |
meta-data files during 'perl Makefile.PL'. |
| 23 |
|
| 24 |
-Defaults to false. |
| 25 |
+Defaults to true. |
| 26 |
|
| 27 |
=item NO_PACKLIST |
| 28 |
|
| 29 |
When true, suppresses the writing of C<packlist> files for installs. |
| 30 |
|
| 31 |
-Defaults to false. |
| 32 |
+Defaults to true. |
| 33 |
|
| 34 |
=item NO_PERLLOCAL |
| 35 |
|
| 36 |
--- lib/ExtUtils/MM_Unix.pm.bak 2013-11-25 20:48:24.903741658 +0400 |
| 37 |
+++ lib/ExtUtils/MM_Unix.pm 2013-11-25 20:50:54.662739652 +0400 |
| 38 |
@@ -1574,6 +1574,16 @@ |
| 39 |
$self->{FULLEXT} = $self->catdir(split /::/, $self->{NAME}); |
| 40 |
|
| 41 |
|
| 42 |
+ # Workaround for https://bugs.gentoo.org/show_bug.cgi?id=221179 |
| 43 |
+ if (!exists($self->{NO_PERLLOCAL})) { |
| 44 |
+ $self->{NO_PERLLOCAL} = 1; |
| 45 |
+ } |
| 46 |
+ |
| 47 |
+ if (!exists($self->{NO_PACKLIST})) { |
| 48 |
+ $self->{NO_PACKLIST} = 1; |
| 49 |
+ } |
| 50 |
+ |
| 51 |
+ |
| 52 |
# Copied from DynaLoader: |
| 53 |
|
| 54 |
my(@modparts) = split(/::/,$self->{NAME}); |
| 55 |
--- t/basic.t.bak 2013-11-25 20:48:29.919741591 +0400 |
| 56 |
+++ t/basic.t 2013-11-25 20:51:15.437739373 +0400 |
| 57 |
@@ -43,7 +43,7 @@ |
| 58 |
ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy" ) || |
| 59 |
diag("chdir failed: $!"); |
| 60 |
|
| 61 |
-my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=../dummy-install"}); |
| 62 |
+my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=../dummy-install" NO_PERLLOCAL=0 NO_PACKLIST=0}); |
| 63 |
END { rmtree '../dummy-install'; } |
| 64 |
|
| 65 |
cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || |
| 66 |
--- t/INSTALL_BASE.t.bak 2013-11-25 20:48:48.119741347 +0400 |
| 67 |
+++ t/INSTALL_BASE.t 2013-11-25 20:51:42.549739010 +0400 |
| 68 |
@@ -35,7 +35,7 @@ |
| 69 |
|
| 70 |
ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy") || diag("chdir failed; $!"); |
| 71 |
|
| 72 |
-my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=../dummy-install"}); |
| 73 |
+my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=../dummy-install" NO_PERLLOCAL=0 NO_PACKLIST=0}); |
| 74 |
END { rmtree '../dummy-install'; } |
| 75 |
|
| 76 |
cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || |
Archives