diff options
| author |   Tim Orling <timothy.t.orling@linux.intel.com> | 2018-09-06 22:00:25 -0700 |
|---|---|---|
| committer | Tim Orling <timothy.t.orling@linux.intel.com> | 2018-09-06 22:07:29 -0700 |
| commit | 610991e483d2cf6a6b82322406630ed30547e844 (patch) | |
| tree | 574c2ad4fee17b8ab5d3dc3dc359b16f96de1187 /meta/recipes-devtools/perl/perl/debian/mod_paths.diff | |
| parent | 0191456d81500f312569f5813f8c4d5ddadc17a7 (diff) | |
| download | openembedded-core-contrib-610991e483d2cf6a6b82322406630ed30547e844.tar.gz | |
perl: [WIP] upgrade to 5.26.2timo/perl-5.26.2
Bring in patches from debian, best effort at getting past
do_patch task. Needs more work.
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl/debian/mod_paths.diff')
| -rw-r--r-- | meta/recipes-devtools/perl/perl/debian/mod_paths.diff | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/mod_paths.diff b/meta/recipes-devtools/perl/perl/debian/mod_paths.diff index 7e22484038..8a2b32482f 100644 --- a/meta/recipes-devtools/perl/perl/debian/mod_paths.diff +++ b/meta/recipes-devtools/perl/perl/debian/mod_paths.diff @@ -1,7 +1,7 @@ -From 6c6cf14e204f3c031372bfd9604ad524d5691186 Mon Sep 17 00:00:00 2001 +From 9e4a1c99eb3972be704cff277e31a4775f53407d Mon Sep 17 00:00:00 2001 From: Brendan O'Dea <bod@debian.org> Date: Fri, 18 Mar 2005 22:22:25 +1100 -Subject: Tweak @INC ordering for Debian +Subject: [PATCH] Tweak @INC ordering for Debian Our order is: @@ -16,17 +16,19 @@ 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. +(later updates by Niko Tyni) + Patch-Name: debian/mod_paths.diff -Upstream-Status: Pending + --- perl.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/perl.c b/perl.c -index 086645b..e64f1f4 100644 +index 384b294..0fef608 100644 --- a/perl.c +++ b/perl.c -@@ -4373,6 +4373,11 @@ S_init_perllib(pTHX) +@@ -4526,6 +4526,11 @@ S_init_perllib(pTHX) INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE); #endif @@ -38,7 +40,7 @@ index 086645b..e64f1f4 100644 #ifdef SITEARCH_EXP /* sitearch is always relative to sitelib on Windows for * DLL-based path intuition to work correctly */ -@@ -4490,6 +4495,59 @@ S_init_perllib(pTHX) +@@ -4643,6 +4648,59 @@ S_init_perllib(pTHX) INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); #endif @@ -77,16 +79,16 @@ index 086645b..e64f1f4 100644 + subdirectory of sitelib */ + for (p = vers; *p; p++) + { -+ if (arch_vers) ++ if (arch_vers && !strchr(*p, '/')) /* skip arch-specific subdirs */ + { -+ strcpy(arch_vers, *p); ++ my_snprintf(arch_vers, 16, "%s", *p); + if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode)) + S_incpush_use_sep(aTHX_ sitearch, strlen(sitearch), 0x0); + } + -+ if (lib_vers) ++ if (lib_vers && !strchr(*p, '/')) /* skip arch-specific subdirs */ + { -+ strcpy(lib_vers, *p); ++ my_snprintf(lib_vers, 16, "%s", *p); + if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode)) + S_incpush_use_sep(aTHX_ sitelib, strlen(sitelib), 0x0); + } |