]> git.pld-linux.org Git - packages/perl.git/commitdiff
- fix for @INC: removes duplicate entries and changes the order
authorradek <radek@pld-linux.org>
Fri, 14 Mar 2003 23:23:19 +0000 (23:23 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    perl_580-INC.patch -> 1.1

perl_580-INC.patch [new file with mode: 0644]

diff --git a/perl_580-INC.patch b/perl_580-INC.patch
new file mode 100644 (file)
index 0000000..466a02e
--- /dev/null
@@ -0,0 +1,96 @@
+#
+# WARNING:  this patch is devoted to a specific configuration
+#
+--- perl.c~    Tue Jul  9 19:41:43 2002
++++ perl.c     Fri Mar 14 22:54:52 2003
+@@ -3679,39 +3679,6 @@
+     incpush(APPLLIB_EXP, TRUE, TRUE);
+ #endif
+-#ifdef ARCHLIB_EXP
+-    incpush(ARCHLIB_EXP, FALSE, FALSE);
+-#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);
+-      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);
+-      
+-      SvREFCNT_dec(privdir);
+-    }
+-    if (!PL_tainting)
+-      incpush(":", FALSE, FALSE);
+-#else
+-#ifndef PRIVLIB_EXP
+-#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
+-#endif
+-#if defined(WIN32)
+-    incpush(PRIVLIB_EXP, TRUE, FALSE);
+-#else
+-    incpush(PRIVLIB_EXP, FALSE, FALSE);
+-#endif
+-
+ #ifdef SITEARCH_EXP
+     /* sitearch is always relative to sitelib on Windows for
+      * DLL-based path intuition to work correctly */
+@@ -3729,7 +3696,7 @@
+ #endif
+ #ifdef SITELIB_STEM /* Search for version-specific dirs below here */
+-    incpush(SITELIB_STEM, FALSE, TRUE);
++/*    incpush(SITELIB_STEM, FALSE, TRUE); */
+ #endif
+ #ifdef PERL_VENDORARCH_EXP
+@@ -3749,7 +3716,40 @@
+ #endif
+ #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
+-    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE);
++/*    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE); */
++#endif
++
++#ifdef ARCHLIB_EXP
++    incpush(ARCHLIB_EXP, FALSE, FALSE);
++#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);
++      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);
++      
++      SvREFCNT_dec(privdir);
++    }
++    if (!PL_tainting)
++      incpush(":", FALSE, FALSE);
++#else
++#ifndef PRIVLIB_EXP
++#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
++#endif
++#if defined(WIN32)
++    incpush(PRIVLIB_EXP, TRUE, FALSE);
++#else
++    incpush(PRIVLIB_EXP, FALSE, FALSE);
+ #endif
+ #ifdef PERL_OTHERLIBDIRS
This page took 0.04546 seconds and 4 git commands to generate.