diff options
| author | Sergey Skvortsov <skv@FreeBSD.org> | 2009-01-13 21:38:50 +0000 |
|---|---|---|
| committer | Sergey Skvortsov <skv@FreeBSD.org> | 2009-01-13 21:38:50 +0000 |
| commit | 4ab5fefc98eaa00392de2ce4470acec599b7a6a2 (patch) | |
| tree | 5bf114288fee3a5bd15c167bfe721b43460eca45 /lang/perl5.10/files/patch-perl.c | |
| parent | db7510e1736eccb319ee572b971704d92afccb56 (diff) | |
Notes
Diffstat (limited to 'lang/perl5.10/files/patch-perl.c')
| -rw-r--r-- | lang/perl5.10/files/patch-perl.c | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/lang/perl5.10/files/patch-perl.c b/lang/perl5.10/files/patch-perl.c index 918c773b8ccb..e9cd514c8868 100644 --- a/lang/perl5.10/files/patch-perl.c +++ b/lang/perl5.10/files/patch-perl.c @@ -1,58 +1,60 @@ ---- perl.c.orig Fri Apr 22 16:14:27 2005 -+++ perl.c Thu Dec 22 12:47:28 2005 -@@ -4397,6 +4397,27 @@ S_init_perllib(pTHX) - incpush(APPLLIB_EXP, TRUE, TRUE, TRUE); +--- perl.c ++++ perl.c +@@ -4882,6 +4882,28 @@ + incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE); #endif +#ifdef SITEARCH_EXP + /* sitearch is always relative to sitelib on Windows for + * DLL-based path intuition to work correctly */ +# if !defined(WIN32) -+ incpush(SITEARCH_EXP, FALSE, FALSE, TRUE); ++ incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE); +# endif +#endif + +#ifdef SITELIB_EXP +# if defined(WIN32) + /* this picks up sitearch as well */ -+ incpush(SITELIB_EXP, TRUE, FALSE, TRUE); ++ incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE); +# else -+ incpush(SITELIB_EXP, FALSE, FALSE, TRUE); ++ incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE); +# endif +#endif + -+#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ -+ incpush(SITELIB_STEM, FALSE, TRUE, TRUE); ++#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST) ++ /* Search for version-specific dirs below here */ ++ incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE); +#endif + #ifdef ARCHLIB_EXP - incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); + incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); #endif -@@ -4428,27 +4449,6 @@ S_init_perllib(pTHX) - incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); - #else - incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); --#endif -- +@@ -4915,28 +4937,6 @@ + incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE); + #endif + -#ifdef SITEARCH_EXP - /* sitearch is always relative to sitelib on Windows for - * DLL-based path intuition to work correctly */ -# if !defined(WIN32) -- incpush(SITEARCH_EXP, FALSE, FALSE, TRUE); +- incpush(SITEARCH_EXP, FALSE, FALSE, TRUE, TRUE); -# endif -#endif - -#ifdef SITELIB_EXP -# if defined(WIN32) - /* this picks up sitearch as well */ -- incpush(SITELIB_EXP, TRUE, FALSE, TRUE); +- incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE); -# else -- incpush(SITELIB_EXP, FALSE, FALSE, TRUE); +- incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE); -# endif -#endif - --#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ -- incpush(SITELIB_STEM, FALSE, TRUE, TRUE); - #endif - +-#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST) +- /* Search for version-specific dirs below here */ +- incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE); +-#endif +- #ifdef PERL_VENDORARCH_EXP + /* vendorarch is always relative to vendorlib on Windows for + * DLL-based path intuition to work correctly */ |