perl_581-INC.patch

   1 diff --git a/perl.c b/perl.c
   2 index dfb549d..9b5dd4c 100644
   3 --- a/perl.c
   4 +++ b/perl.c
   5 @@ -4151,26 +4151,6 @@ S_init_perllib(pTHX)
   6  #  endif
   7  #endif
   8
   9 -#ifdef ARCHLIB_EXP
  10 -    S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE);
  11 -#endif
  12 -
  13 -#ifndef PRIVLIB_EXP
  14 -#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
  15 -#endif
  16 -
  17 -#if defined(WIN32)
  18 -    s = win32_get_privlib(PERL_FS_VERSION, &len);
  19 -    if (s)
  20 -       incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
  21 -#else
  22 -#  ifdef NETWARE
  23 -    S_incpush_use_sep(aTHX_ PRIVLIB_EXP, 0, INCPUSH_CAN_RELOCATE);
  24 -#  else
  25 -    S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE);
  26 -#  endif
  27 -#endif
  28 -
  29  #ifdef PERL_OTHERLIBDIRS
  30      S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS),
  31                       INCPUSH_ADD_VERSIONED_SUB_DIRS|INCPUSH_NOT_BASEDIR
  32 @@ -4216,15 +4196,35 @@ S_init_perllib(pTHX)
  33
  34  #if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
  35      /* Search for version-specific dirs below here */
  36 -    S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM),
  37 -                     INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
  38 +/*  S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM),
  39 +                     INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); */
  40  #endif
  41
  42
  43  #if defined(PERL_VENDORLIB_STEM) && defined(PERL_INC_VERSION_LIST)
  44      /* Search for version-specific dirs below here */
  45 -    S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM),
  46 -                     INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
  47 +/*  S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM),
  48 +                     INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); */
  49 +#endif
  50 +
  51 +#ifdef ARCHLIB_EXP
  52 +    S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE);
  53 +#endif
  54 +
  55 +#ifndef PRIVLIB_EXP
  56 +#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
  57 +#endif
  58 +
  59 +#if defined(WIN32)
  60 +    s = win32_get_privlib(PERL_FS_VERSION, &len);
  61 +    if (s)
  62 +       incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
  63 +#else
  64 +#  ifdef NETWARE
  65 +    S_incpush_use_sep(aTHX_ PRIVLIB_EXP, 0, INCPUSH_CAN_RELOCATE);
  66 +#  else
  67 +    S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE);
  68 +#  endif
  69  #endif
  70
  71  #ifdef PERL_OTHERLIBDIRS