diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-04-23 19:43:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-28 09:52:23 +0100 |
commit | 3a08c401f298095840a2aee9079845f5ff434410 (patch) | |
tree | ef5b13c0563c104a6068f1b76635800991a0a8f5 /meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff | |
parent | 26858099bc104efc3b3d15d9298018285c551b9a (diff) | |
download | openembedded-core-3a08c401f298095840a2aee9079845f5ff434410.tar.gz openembedded-core-3a08c401f298095840a2aee9079845f5ff434410.tar.bz2 openembedded-core-3a08c401f298095840a2aee9079845f5ff434410.tar.xz openembedded-core-3a08c401f298095840a2aee9079845f5ff434410.zip |
perl: upgrade from 5.12.2 to 5.12.3
And changed the perl tarball URL to more stable cpan location.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff deleted file mode 100644 index 96fe4dfef..000000000 --- a/meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff +++ /dev/null @@ -1,100 +0,0 @@ -Upstream-Status:Inappropriate [debian patch] - -Subject: Tweak @INC ordering for Debian - -Our order is: - - etc (for config files) - site (5.8.1) - vendor (all) - core (5.8.1) - site (version-indep) - site (pre-5.8.1) - -The rationale being that an admin (via site), or module packager -(vendor) can chose to shadow core modules when there is a newer -version than is included in core. - - ---- - perl.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 58 insertions(+), 0 deletions(-) - -diff --git a/perl.c b/perl.c -index 05cea40..023d6a0 100644 ---- a/perl.c -+++ b/perl.c -@@ -4125,6 +4125,11 @@ S_init_perllib(pTHX) - INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE); - #endif - -+#ifdef DEBIAN -+ /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */ -+ S_incpush_use_sep(aTHX_ STR_WITH_LEN("/etc/perl"), 0x0); -+#endif -+ - #ifdef SITEARCH_EXP - /* sitearch is always relative to sitelib on Windows for - * DLL-based path intuition to work correctly */ -@@ -4242,6 +4247,59 @@ S_init_perllib(pTHX) - INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); - #endif - -+#ifdef DEBIAN -+ /* Non-versioned site directory for local modules and for -+ compatability with the previous packages' site dirs */ -+ S_incpush_use_sep(aTHX_ STR_WITH_LEN("/usr/local/lib/site_perl"), -+ INCPUSH_ADD_SUB_DIRS); -+ -+#ifdef PERL_INC_VERSION_LIST -+ { -+ struct stat s; -+ -+ /* add small buffer in case old versions are longer than the -+ current version */ -+ char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP; -+ char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP; -+ char const *vers[] = { PERL_INC_VERSION_LIST }; -+ char const **p; -+ -+ char *arch_vers = strrchr(sitearch, '/'); -+ char *lib_vers = strrchr(sitelib, '/'); -+ -+ if (arch_vers && isdigit(*++arch_vers)) -+ *arch_vers = 0; -+ else -+ arch_vers = 0; -+ -+ if (lib_vers && isdigit(*++lib_vers)) -+ *lib_vers = 0; -+ else -+ lib_vers = 0; -+ -+ /* there is some duplication here as incpush does something -+ similar internally, but required as sitearch is not a -+ subdirectory of sitelib */ -+ for (p = vers; *p; p++) -+ { -+ if (arch_vers) -+ { -+ strcpy(arch_vers, *p); -+ if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode)) -+ S_incpush_use_sep(aTHX_ sitearch, strlen(sitearch), 0x0); -+ } -+ -+ if (lib_vers) -+ { -+ strcpy(lib_vers, *p); -+ if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode)) -+ S_incpush_use_sep(aTHX_ sitelib, strlen(sitelib), 0x0); -+ } -+ } -+ } -+#endif -+#endif -+ - #ifdef PERL_OTHERLIBDIRS - S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS), - INCPUSH_ADD_OLD_VERS|INCPUSH_ADD_ARCHONLY_SUB_DIRS --- -tg: (c823880..) debian/mod_paths (depends on: upstream) |