mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-12-08 23:03:46 +00:00
102 lines
3 KiB
Diff
102 lines
3 KiB
Diff
|
Tweak @INC so that the ordering is:
|
||
|
|
site (5.8.8)
|
||
|
|
vendor (all)
|
||
|
|
core (5.8.8)
|
||
|
|
obsolete (pre-5.8.8-9) vendor builds
|
||
|
|
|
||
|
|
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.
|
||
|
|
|
||
|
|
Thanks to Charles Mauch (xterminus) for his work on the initial patch.
|
||
|
|
|
||
|
|
--- perl.c.orig 2006-01-31 07:34:47.000000000 -0500
|
||
|
|
+++ perl.c 2007-10-31 22:46:56.000000000 -0400
|
||
|
|
@@ -4771,44 +4771,12 @@
|
||
|
|
|
||
|
|
/* Use the ~-expanded versions of APPLLIB (undocumented),
|
||
|
|
ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
|
||
|
|
+ Arch Linux: SITEARCH SITELIB VENDORARCH VENDORLIB ARCHLIB PRIVLIB OTHER
|
||
|
|
*/
|
||
|
|
#ifdef APPLLIB_EXP
|
||
|
|
incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#ifdef ARCHLIB_EXP
|
||
|
|
- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
|
||
|
|
-#endif
|
||
|
|
-#ifdef MACOS_TRADITIONAL
|
||
|
|
- {
|
||
|
|
- Stat_t tmpstatbuf;
|
||
|
|
- SV * privdir = NEWSV(55, 0);
|
||
|
|
- char * macperl = PerlEnv_getenv("MACPERL");
|
||
|
|
-
|
||
|
|
- if (!macperl)
|
||
|
|
- macperl = "";
|
||
|
|
-
|
||
|
|
- Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
|
||
|
|
- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
|
||
|
|
- incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
|
||
|
|
- Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
|
||
|
|
- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
|
||
|
|
- incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
|
||
|
|
-
|
||
|
|
- SvREFCNT_dec(privdir);
|
||
|
|
- }
|
||
|
|
- if (!PL_tainting)
|
||
|
|
- incpush(":", FALSE, FALSE, TRUE);
|
||
|
|
-#else
|
||
|
|
-#ifndef PRIVLIB_EXP
|
||
|
|
-# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
|
||
|
|
-#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
|
||
|
|
* DLL-based path intuition to work correctly */
|
||
|
|
@@ -4850,6 +4818,40 @@
|
||
|
|
incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+/* Arch Linux: core libs after site and vendor libs. */
|
||
|
|
+#ifdef ARCHLIB_EXP
|
||
|
|
+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
|
||
|
|
+#endif
|
||
|
|
+#ifdef MACOS_TRADITIONAL
|
||
|
|
+ {
|
||
|
|
+ Stat_t tmpstatbuf;
|
||
|
|
+ SV * privdir = NEWSV(55, 0);
|
||
|
|
+ char * macperl = PerlEnv_getenv("MACPERL");
|
||
|
|
+
|
||
|
|
+ if (!macperl)
|
||
|
|
+ macperl = "";
|
||
|
|
+
|
||
|
|
+ Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
|
||
|
|
+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
|
||
|
|
+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
|
||
|
|
+ Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
|
||
|
|
+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
|
||
|
|
+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
|
||
|
|
+
|
||
|
|
+ SvREFCNT_dec(privdir);
|
||
|
|
+ }
|
||
|
|
+ if (!PL_tainting)
|
||
|
|
+ incpush(":", FALSE, FALSE, TRUE);
|
||
|
|
+#else
|
||
|
|
+#ifndef PRIVLIB_EXP
|
||
|
|
+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
|
||
|
|
+#endif
|
||
|
|
+#if defined(WIN32)
|
||
|
|
+ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
|
||
|
|
+#else
|
||
|
|
+ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#ifdef PERL_OTHERLIBDIRS
|
||
|
|
incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
|
||
|
|
#endif
|