mirror of
git://git.yoctoproject.org/poky
synced 2026-08-14 09:05:13 +00:00
3f7e55baa6
* Remove:
- perl-5.14.3-fix-CVE-2010-4777.patch: backport
- fix-FF_MORE-crash.patch: backport
- perl-rprovides.inc: it was introduced by 5.8.7, the lines in it are like:
RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
If some packages do RPDEND on something like
perl-module-${TARGET_SYS}-b-asmdatam, we need update the package rather
than keep use RPROVIDES in perl-rprovides.inc, so remove it.
- perl-rprovides_5.20.0.inc: it only has one line:
RPROVIDES_perl-module-module-build, but the perl-module-module-build
is gone in 5.22.0, so remove it.
* Update:
- debian patches from http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz
- Makefile.SH.patch
- Merge 0001-Makefile.SH-fix-do_install-failed.patch into Makefile.SH.patch
- native-nopacklist.patch
- config.sh
* The CGI.pm and Module::Build disappear from core, so no
perl-module-module-build.rpm any more, more info:
http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22
(From OE-Core rev: 06d43a90acbe63baea62d220659149a3ff2f9198)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
92 lines
3.4 KiB
Diff
92 lines
3.4 KiB
Diff
Upstream-Status:Inappropriate [debian patch]
|
|
|
|
Part of 52_debian_extutils_hacks.patch just to exclude the installation of .packlist files
|
|
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
---
|
|
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 35 ++---------------------
|
|
1 file changed, 3 insertions(+), 32 deletions(-)
|
|
|
|
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
|
|
index f63145c..a589710 100644
|
|
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
|
|
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
|
|
@@ -2122,11 +2122,6 @@ pure_perl_install :: all
|
|
};
|
|
|
|
push @m,
|
|
-q{ read "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
|
|
- write "}.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
|
|
-} unless $self->{NO_PACKLIST};
|
|
-
|
|
- push @m,
|
|
q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
|
|
"$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \
|
|
"$(INST_BIN)" "$(DESTINSTALLBIN)" \
|
|
@@ -2158,10 +2153,6 @@ q{ "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
|
|
pure_vendor_install :: all
|
|
$(NOECHO) $(MOD_INSTALL) \
|
|
};
|
|
- push @m,
|
|
-q{ read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
|
|
- write "}.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{" \
|
|
-} unless $self->{NO_PACKLIST};
|
|
|
|
push @m,
|
|
q{ "$(INST_LIB)" "$(DESTINSTALLVENDORLIB)" \
|
|
@@ -2187,37 +2178,19 @@ doc_vendor_install :: all
|
|
|
|
push @m, q{
|
|
doc_perl_install :: all
|
|
- $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
|
|
- -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
|
|
- -$(NOECHO) $(DOC_INSTALL) \
|
|
- "Module" "$(NAME)" \
|
|
- "installed into" $(INSTALLPRIVLIB) \
|
|
- LINKTYPE "$(LINKTYPE)" \
|
|
- VERSION "$(VERSION)" \
|
|
- EXE_FILES "$(EXE_FILES)" \
|
|
- >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
|
|
|
|
doc_site_install :: all
|
|
- $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
|
|
- -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
|
|
+ $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLSITEARCH)/perllocal.pod"
|
|
+ -$(NOECHO) $(MKPATH) "$(DESTINSTALLSITEARCH)"
|
|
-$(NOECHO) $(DOC_INSTALL) \
|
|
"Module" "$(NAME)" \
|
|
"installed into" $(INSTALLSITELIB) \
|
|
LINKTYPE "$(LINKTYPE)" \
|
|
VERSION "$(VERSION)" \
|
|
EXE_FILES "$(EXE_FILES)" \
|
|
- >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
|
|
+ >> "}.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{"
|
|
|
|
doc_vendor_install :: all
|
|
- $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
|
|
- -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
|
|
- -$(NOECHO) $(DOC_INSTALL) \
|
|
- "Module" "$(NAME)" \
|
|
- "installed into" $(INSTALLVENDORLIB) \
|
|
- LINKTYPE "$(LINKTYPE)" \
|
|
- VERSION "$(VERSION)" \
|
|
- EXE_FILES "$(EXE_FILES)" \
|
|
- >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
|
|
|
|
} unless $self->{NO_PERLLOCAL};
|
|
|
|
@@ -2226,13 +2199,11 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
|
|
$(NOECHO) $(NOOP)
|
|
|
|
uninstall_from_perldirs ::
|
|
- $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{"
|
|
|
|
uninstall_from_sitedirs ::
|
|
$(NOECHO) $(UNINSTALL) "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{"
|
|
|
|
uninstall_from_vendordirs ::
|
|
- $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{"
|
|
};
|
|
|
|
join("",@m);
|