/[pkgs]/devel/perl/perl-5.10.0-reorderINC.patch
ViewVC logotype

Contents of /devel/perl/perl-5.10.0-reorderINC.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Wed Mar 11 22:01:05 2009 UTC (8 months, 1 week ago) by spot
Branch: MAIN
CVS Tags: F-12-split, perl-5_10_0-63_fc11, perl-5_10_0-61_fc11, perl-5_10_0-80_fc12, perl-5_10_0-81_fc12, perl-5_10_0-84_fc13, perl-5_10_0-82_fc13, perl-5_10_0-77_fc12, perl-5_10_0-83_fc13, perl-5_10_0-71_fc12, perl-5_10_0-75_fc12, perl-5_10_0-73_fc12, perl-5_10_0-68_fc11, perl-5_10_0-67_fc11, perl-5_10_0-64_fc11, perl-5_10_0-72_fc12, F-11-split, perl-5_10_0-62_fc11, perl-5_10_0-69_fc12, perl-5_10_0-79_fc12, perl-5_10_0-78_fc12, perl-5_10_0-70_fc12, perl-5_10_0-74_fc12, perl-5_10_0-66_fc11, perl-5_10_0-65_fc11, perl-5_10_0-76_fc12, HEAD
File MIME type: text/x-patch 
reorder @INC, fix bz 489204, merge useful debian patches
1 diff -up perl-5.10.0/perl.c.BAD perl-5.10.0/perl.c
2 --- perl-5.10.0/perl.c.BAD 2009-03-09 09:55:05.000000000 -0400
3 +++ perl-5.10.0/perl.c 2009-03-09 10:00:41.000000000 -0400
4 @@ -4753,9 +4753,6 @@ S_init_perllib(pTHX)
5 incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
6 #endif
7
8 -#ifdef ARCHLIB_EXP
9 - incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
10 -#endif
11 #ifdef MACOS_TRADITIONAL
12 {
13 Stat_t tmpstatbuf;
14 @@ -4764,6 +4761,10 @@ S_init_perllib(pTHX)
15
16 if (!macperl)
17 macperl = "";
18 +
19 +#ifdef ARCHLIB_EXP
20 + incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
21 +#endif
22
23 Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
24 if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
25 @@ -4777,14 +4778,6 @@ S_init_perllib(pTHX)
26 if (!PL_tainting)
27 incpush(":", FALSE, FALSE, TRUE, FALSE);
28 #else
29 -#ifndef PRIVLIB_EXP
30 -# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
31 -#endif
32 -#if defined(WIN32)
33 - incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
34 -#else
35 - incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
36 -#endif
37
38 #ifdef SITEARCH_EXP
39 /* sitearch is always relative to sitelib on Windows for
40 @@ -4828,6 +4821,19 @@ S_init_perllib(pTHX)
41 incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
42 #endif
43
44 +#ifdef ARCHLIB_EXP
45 + incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
46 +#endif
47 +
48 +#ifndef PRIVLIB_EXP
49 +# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
50 +#endif
51 +#if defined(WIN32)
52 + incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
53 +#else
54 + incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
55 +#endif
56 +
57 #ifdef PERL_OTHERLIBDIRS
58 incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
59 #endif
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2