summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cummings <mcummings@gentoo.org>2006-01-24 17:13:55 +0000
committerMichael Cummings <mcummings@gentoo.org>2006-01-24 17:13:55 +0000
commitd616dc914e9fe897ebd362a0f6e5001e7c4ea365 (patch)
tree4d79695052bb76dcbc65042572116bdb77bd6667 /sys-devel/libperl/files
parentupdating manifest (diff)
downloadhistorical-d616dc914e9fe897ebd362a0f6e5001e7c4ea365.tar.gz
historical-d616dc914e9fe897ebd362a0f6e5001e7c4ea365.tar.bz2
historical-d616dc914e9fe897ebd362a0f6e5001e7c4ea365.zip
Some tweaks to libperl-5.8.8 installation
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'sys-devel/libperl/files')
-rw-r--r--sys-devel/libperl/files/libperl-5.8.8_rc1-reorder-INC.patch93
1 files changed, 93 insertions, 0 deletions
diff --git a/sys-devel/libperl/files/libperl-5.8.8_rc1-reorder-INC.patch b/sys-devel/libperl/files/libperl-5.8.8_rc1-reorder-INC.patch
new file mode 100644
index 000000000000..11c56929cf1a
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-5.8.8_rc1-reorder-INC.patch
@@ -0,0 +1,93 @@
+--- perl.c.orig 2006-01-24 09:57:33.000000000 -0500
++++ perl.c 2006-01-24 10:03:15.000000000 -0500
+@@ -4777,9 +4777,9 @@ S_init_perllib(pTHX)
+ incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #endif
+
+-#ifdef ARCHLIB_EXP
+- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
+-#endif
++ /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */
++ incpush("/etc/perl", FALSE, FALSE, TRUE);
++
+ #ifdef MACOS_TRADITIONAL
+ {
+ Stat_t tmpstatbuf;
+@@ -4806,51 +4806,58 @@ S_init_perllib(pTHX)
+ #endif
+ #if defined(WIN32)
+ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
+-#else
+- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
+ #endif
+
+-#ifdef SITEARCH_EXP
+- /* sitearch is always relative to sitelib on Windows for
++#ifdef PERL_VENDORARCH_EXP
++ /* vendorarch is always relative to vendorlib on Windows for
+ * DLL-based path intuition to work correctly */
+ # if !defined(WIN32)
+- incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
++ incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE);
+ # endif
+ #endif
+
+-#ifdef SITELIB_EXP
++#ifdef PERL_VENDORLIB_EXP
+ # if defined(WIN32)
+- /* this picks up sitearch as well */
+- incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
++ incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE); /* this picks up vendorarch as well */
+ # else
+- incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
++ incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE);
+ # endif
+ #endif
+
+-#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
+- incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
++#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
++ incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
+ #endif
+
+-#ifdef PERL_VENDORARCH_EXP
+- /* vendorarch is always relative to vendorlib on Windows for
++#ifdef SITEARCH_EXP
++ /* sitearch is always relative to sitelib on Windows for
+ * DLL-based path intuition to work correctly */
+ # if !defined(WIN32)
+- incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE);
++ incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
+ # endif
+ #endif
+
+-#ifdef PERL_VENDORLIB_EXP
++#ifdef SITELIB_EXP
+ # if defined(WIN32)
+- incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE); /* this picks up vendorarch as well */
++ /* this picks up sitearch as well */
++ incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
+ # else
+- incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE);
++ incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
+ # endif
+ #endif
+
+-#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
+- incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
++#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
++ incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
+ #endif
+
++ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
++ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
++
++ /* Non-versioned site directory for local modules and for
++ compatability with the previous packages' site dirs */
++
++ incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE);
++
++
+ #ifdef PERL_OTHERLIBDIRS
+ incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
+ #endif