diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.3/parallel_build_fix_4.patch')
| -rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.3/parallel_build_fix_4.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/parallel_build_fix_4.patch b/meta/recipes-devtools/perl/perl-5.12.3/parallel_build_fix_4.patch new file mode 100644 index 0000000000..98bf0743fb --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.3/parallel_build_fix_4.patch @@ -0,0 +1,57 @@ +Upstream-Status:Inappropriate [Backport] + +commit 43c0c913165d6abe1bc0cb45a784eb1c32c3700b +Author: Nicholas Clark <nick@ccl4.org> +Date: Mon Feb 14 09:06:42 2011 +0000 + + For miniperl, use the USE_SITECUSTOMIZE feature to load the build-time @INC + + For miniperl (only), always enable USE_SITECUSTOMIZE, but change it to load + a buildcustomize.pl file from $INC[0], if present. The default @INC for + miniperl is '.', so by default this does nothing. + +diff --git a/perl.c b/perl.c +index 8f8565d..6bb9f46 100644 +--- a/perl.c ++++ b/perl.c +@@ -24,6 +24,10 @@ + * function of the interpreter; that can be found in perlmain.c + */ + ++#ifdef PERL_IS_MINIPERL ++# define USE_SITECUSTOMIZE ++#endif ++ + #include "EXTERN.h" + #define PERL_IN_PERL_C + #include "perl.h" +@@ -1973,15 +1977,26 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) + } + } + +-#if defined(USE_SITECUSTOMIZE) && !defined(PERL_IS_MINIPERL) ++#if defined(USE_SITECUSTOMIZE) + if (!minus_f) { +- /* SITELIB_EXP is a function call on Win32. +- The games with local $! are to avoid setting errno if there is no ++ /* The games with local $! are to avoid setting errno if there is no + sitecustomize script. */ ++# ifdef PERL_IS_MINIPERL ++ AV *const inc = GvAV(PL_incgv); ++ SV **const inc0 = inc ? av_fetch(inc, 0, FALSE) : NULL; ++ ++ if (inc0) { ++ (void)Perl_av_create_and_unshift_one(aTHX_ &PL_preambleav, ++ Perl_newSVpvf(aTHX_ ++ "BEGIN { do {local $!; -f '%"SVf"/buildcustomize.pl'} && do '%"SVf"/buildcustomize.pl' }", *inc0, *inc0)); ++ } ++# else ++ /* SITELIB_EXP is a function call on Win32. */ + const char *const sitelib = SITELIB_EXP; + (void)Perl_av_create_and_unshift_one(aTHX_ &PL_preambleav, + Perl_newSVpvf(aTHX_ + "BEGIN { do {local $!; -f '%s/sitecustomize.pl'} && do '%s/sitecustomize.pl' }", sitelib, sitelib)); ++# endif + } + #endif + |