perl parallel build fixes

new file mode 100644
index 0000000..1a047bc
@@ -0,0 +1,55 @@
+commit 43c0c913165d6abe1bc0cb45a784eb1c32c3700b
+Author: Nicholas Clark <[email protected]>
+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
+ 

428 lines not on this page · raw message

156 lines not on this page · raw message

index cd21e9e..9af7b06 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
 		    file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
-PR = "r6"
+PR = "r7"
 
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
                     file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"

@@ -15,6 +15,9 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
            file://parallel_build_fix_1.patch \
            file://parallel_build_fix_2.patch \
            file://parallel_build_fix_3.patch \
+           file://parallel_build_fix_4.patch \
+           file://parallel_build_fix_5.patch \
+           file://parallel_build_fix_6.patch \
            file://native-nopacklist.patch;patch=1 \
            file://native-perlinc.patch;patch=1"
 

index 18fad18..184e1e7 100644
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native-${PV} grep-native"
 DEPENDS += "gdbm zlib"
-PR = "r2"
+PR = "r3"
 
 # 5.10.1 has Module::Build built-in
 PROVIDES += "libmodule-build-perl"

@@ -21,6 +21,9 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
         file://parallel_build_fix_1.patch \
         file://parallel_build_fix_2.patch \
         file://parallel_build_fix_3.patch \
+        file://parallel_build_fix_4.patch \
+        file://parallel_build_fix_5.patch \
+        file://parallel_build_fix_6.patch \
         file://Makefile.SH.patch;patch=1 \
         file://installperl.patch;patch=1 \
         file://perl-dynloader.patch;patch=1 \