diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /perl-core/ExtUtils-MakeMaker/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'perl-core/ExtUtils-MakeMaker/files')
4 files changed, 183 insertions, 0 deletions
diff --git a/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch b/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch new file mode 100644 index 000000000000..41f26098b2bd --- /dev/null +++ b/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch @@ -0,0 +1,16 @@ +--- a/lib/ExtUtils/MM_Any.pm ++++ b/lib/ExtUtils/MM_Any.pm +@@ -1900,6 +1900,13 @@ CODE + # LD_RUN_PATH now computed by ExtUtils::Liblist + ($self->{EXTRALIBS}, $self->{BSLOADLIBS}, + $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs; ++ # We do not want the build root in RPATH ++ if ( exists $ENV{PORTAGE_TMPDIR} ){ ++ # If we have a PORTAGE_TMPDIR set, strip that, as just testing for ++ # /usr and /opt might not be sufficient. ++ $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/, ++ split /:/, $self->{LD_RUN_PATH}; ++ } + last; + } + } diff --git a/perl-core/ExtUtils-MakeMaker/files/7.04-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/7.04-delete_packlist_podlocal.patch new file mode 100644 index 000000000000..266d5d240c04 --- /dev/null +++ b/perl-core/ExtUtils-MakeMaker/files/7.04-delete_packlist_podlocal.patch @@ -0,0 +1,63 @@ +diff -ruN ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MM_Unix.pm ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm +--- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MM_Unix.pm 2014-12-02 13:44:33.000000000 +0100 ++++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm 2015-02-25 23:54:03.373862321 +0100 +@@ -1606,6 +1606,16 @@ + $self->{FULLEXT} = $self->catdir(split /::/, $self->{NAME}); + + ++ # Workaround for https://bugs.gentoo.org/show_bug.cgi?id=221179 ++ if (!exists($self->{NO_PERLLOCAL})) { ++ $self->{NO_PERLLOCAL} = 1; ++ } ++ ++ if (!exists($self->{NO_PACKLIST})) { ++ $self->{NO_PACKLIST} = 1; ++ } ++ ++ + # Copied from DynaLoader: + + my(@modparts) = split(/::/,$self->{NAME}); +diff -ruN ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MakeMaker.pm ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm +--- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MakeMaker.pm 2014-12-02 13:44:33.000000000 +0100 ++++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm 2015-02-25 23:54:03.373862321 +0100 +@@ -2348,13 +2348,13 @@ + When true, suppresses the generation of MYMETA.yml and MYMETA.json module + meta-data files during 'perl Makefile.PL'. + +-Defaults to false. ++Defaults to true. + + =item NO_PACKLIST + + When true, suppresses the writing of C<packlist> files for installs. + +-Defaults to false. ++Defaults to true. + + =item NO_PERLLOCAL + +diff -ruN ExtUtils-MakeMaker-7.04.orig/t/INSTALL_BASE.t ExtUtils-MakeMaker-7.04/t/INSTALL_BASE.t +--- ExtUtils-MakeMaker-7.04.orig/t/INSTALL_BASE.t 2014-11-11 14:50:52.000000000 +0100 ++++ ExtUtils-MakeMaker-7.04/t/INSTALL_BASE.t 2015-02-25 23:59:00.383878929 +0100 +@@ -42,7 +42,7 @@ + ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy") || diag("chdir failed; $!"); + + for my $instdir (@INSTDIRS) { +- my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=$instdir"}); ++ my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=$instdir" NO_PERLLOCAL=0 NO_PACKLIST=0}); + + cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || + diag(@mpl_out); +diff -ruN ExtUtils-MakeMaker-7.04.orig/t/basic.t ExtUtils-MakeMaker-7.04/t/basic.t +--- ExtUtils-MakeMaker-7.04.orig/t/basic.t 2014-11-11 14:50:52.000000000 +0100 ++++ ExtUtils-MakeMaker-7.04/t/basic.t 2015-02-25 23:56:51.161871703 +0100 +@@ -59,7 +59,7 @@ + + sub extrachar { $] > 5.008 && !$ENV{PERL_CORE} ? utf8::decode(my $c='š') : 's' } + my $DUMMYINST = '../dummy-in'.extrachar().'tall'; +-my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST"}); ++my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST" NO_PERLLOCAL=0 NO_PACKLIST=0}); + END { rmtree $DUMMYINST; } + + cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || diff --git a/perl-core/ExtUtils-MakeMaker/files/7.24-RUNPATH.patch b/perl-core/ExtUtils-MakeMaker/files/7.24-RUNPATH.patch new file mode 100644 index 000000000000..6f21f2c733b8 --- /dev/null +++ b/perl-core/ExtUtils-MakeMaker/files/7.24-RUNPATH.patch @@ -0,0 +1,30 @@ +From 5da957658fba21be51b638bcfee32b97090ad0da Mon Sep 17 00:00:00 2001 +From: Kent Fredric <kentfredric@gmail.com> +Date: Sun, 19 Mar 2017 01:55:56 +1300 +Subject: Prevent build root appearing in RPATH + +--- + lib/ExtUtils/MM_Any.pm | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm +index 433a8dd..ebcb6fc 100644 +--- a/lib/ExtUtils/MM_Any.pm ++++ b/lib/ExtUtils/MM_Any.pm +@@ -2422,6 +2422,13 @@ sub init_others { + # LD_RUN_PATH now computed by ExtUtils::Liblist + ($self->{EXTRALIBS}, $self->{BSLOADLIBS}, + $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs; ++ # We do not want the build root in RPATH ++ if ( exists $ENV{PORTAGE_TMPDIR} ){ ++ # If we have a PORTAGE_TMPDIR set, strip that, as just testing for ++ # /usr and /opt might not be sufficient. ++ $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/, ++ split /:/, $self->{LD_RUN_PATH}; ++ } + last; + } + } +-- +2.12.0 + diff --git a/perl-core/ExtUtils-MakeMaker/files/7.24-delete_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/7.24-delete_podlocal.patch new file mode 100644 index 000000000000..8277e0d37c21 --- /dev/null +++ b/perl-core/ExtUtils-MakeMaker/files/7.24-delete_podlocal.patch @@ -0,0 +1,74 @@ +From f1939e044183c711f23468eb1aa068435add42c6 Mon Sep 17 00:00:00 2001 +From: Kent Fredric <kentfredric@gmail.com> +Date: Sun, 19 Mar 2017 01:52:52 +1300 +Subject: Inhibit generation of perllocal.pod + +--- + lib/ExtUtils/MM_Unix.pm | 5 +++++ + t/INSTALL_BASE.t | 2 +- + t/basic.t | 6 +++--- + 3 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm +index 66a24d7..82d7b42 100644 +--- a/lib/ExtUtils/MM_Unix.pm ++++ b/lib/ExtUtils/MM_Unix.pm +@@ -1682,6 +1682,11 @@ sub init_main { + ### $self->{NAME}) =~ s!::!/!g ; #eg. BSD/Foo/Socket + $self->{FULLEXT} = $self->catdir(split /::/, $self->{NAME}); + ++ # Workaround for https://bugs.gentoo.org/show_bug.cgi?id=221179 ++ if (!exists($self->{NO_PERLLOCAL})) { ++ $self->{NO_PERLLOCAL} = 1; ++ } ++ + + # Copied from DynaLoader: + +diff --git a/t/INSTALL_BASE.t b/t/INSTALL_BASE.t +index 6939811..f7cf8d4 100644 +--- a/t/INSTALL_BASE.t ++++ b/t/INSTALL_BASE.t +@@ -49,7 +49,7 @@ ok( chdir(File::Spec->catdir($SPACEDIR, 'Big-Dummy')), "chdir'd to Big-Dummy") | + for my $instdir (@INSTDIRS) { + $instdir = File::Spec->rel2abs($instdir); + $instdir = VMS::Filespec::unixpath($instdir) if $Is_VMS; +- my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=$instdir"}); ++ my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=$instdir" NO_PERLLOCAL=0 NO_PACKLIST=0}); + + cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || + diag(@mpl_out); +diff --git a/t/basic.t b/t/basic.t +index c98e28c..97db20a 100644 +--- a/t/basic.t ++++ b/t/basic.t +@@ -24,7 +24,7 @@ use ExtUtils::MM; + use Test::More + !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'} + ? (skip_all => "cross-compiling and make not available") +- : (tests => 186); ++ : (tests => 180); + use File::Find; + use File::Spec; + use File::Path; +@@ -79,7 +79,7 @@ sub extrachar { + 'š'; + } + my $DUMMYINST = '../dummy-in'.extrachar().'tall'; +-my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST"}); ++my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST" NO_PERLLOCAL=0 NO_PACKLIST=0}); + + cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || + diag(@mpl_out); +@@ -196,7 +196,7 @@ sub check_dummy_inst { + ok( $files{'liar.pm'}, ' Liar.pm installed' ) unless $skipsubdir; + ok( $files{'program'}, ' program installed' ); + ok( $files{'.packlist'}, ' packlist created' ); +- ok( $files{'perllocal.pod'},' perllocal.pod created' ); ++# ok( $files{'perllocal.pod'},' perllocal.pod created' ); + \%files; + } + +-- +2.12.0 + |