diff options
Diffstat (limited to 'sys-devel/libperl/files/libperl-reorder-INC.patch')
-rw-r--r-- | sys-devel/libperl/files/libperl-reorder-INC.patch | 55 |
1 files changed, 5 insertions, 50 deletions
diff --git a/sys-devel/libperl/files/libperl-reorder-INC.patch b/sys-devel/libperl/files/libperl-reorder-INC.patch index c934b4135a13..cc314d97d314 100644 --- a/sys-devel/libperl/files/libperl-reorder-INC.patch +++ b/sys-devel/libperl/files/libperl-reorder-INC.patch @@ -1,6 +1,6 @@ ---- perl.c.orig 2003-07-10 22:09:00.000000000 -0700 -+++ perl.c 2003-07-10 22:30:21.000000000 -0700 -@@ -3932,9 +3932,9 @@ +--- perl.c.orig 2005-07-26 13:04:54.000000000 -0400 ++++ perl.c 2005-07-26 13:05:05.000000000 -0400 +@@ -4397,9 +4397,9 @@ S_init_perllib(pTHX) incpush(APPLLIB_EXP, TRUE, TRUE, TRUE); #endif @@ -13,7 +13,7 @@ #ifdef MACOS_TRADITIONAL { Stat_t tmpstatbuf; -@@ -3961,8 +3961,6 @@ +@@ -4426,8 +4426,6 @@ S_init_perllib(pTHX) #endif #if defined(WIN32) incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); @@ -22,7 +22,7 @@ #endif #ifdef SITEARCH_EXP -@@ -4006,6 +4004,60 @@ +@@ -4471,6 +4469,15 @@ S_init_perllib(pTHX) incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); #endif @@ -34,51 +34,6 @@ + + incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE); + -+#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)) -+ incpush(sitearch, FALSE, FALSE, TRUE); -+ } -+ -+ if (lib_vers) -+ { -+ strcpy(lib_vers, *p); -+ if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode)) -+ incpush(sitelib, FALSE, FALSE, TRUE); -+ } -+ } -+} -+#endif + #ifdef PERL_OTHERLIBDIRS incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE); |