diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch | 156 |
1 files changed, 156 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch new file mode 100644 index 0000000000..0520c307db --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch | |||
@@ -0,0 +1,156 @@ | |||
1 | Rebased by Nitin A Kamble <nitin.a.kamble@intel.com> on 3/11/2011 | ||
2 | |||
3 | commit 7353f64c5bca6e7102582a1e0017c850930249c3 | ||
4 | Author: Nicholas Clark <nick@ccl4.org> | ||
5 | Date: Mon Feb 14 20:36:36 2011 +0000 | ||
6 | |||
7 | Add ext/re/re.pm to the @INC set for miniperl by lib/buildcustomize.pl | ||
8 | |||
9 | This avoids a build-time race condition where lib/re.pm might be read midway | ||
10 | through the *second* copy of it (when ext/re/Makefile is being run). It also | ||
11 | simplifies many [Mm]akefile* rules, which previously had a special case to | ||
12 | copy it early. | ||
13 | |||
14 | Index: perl-5.12.2/Cross/Makefile-cross-SH | ||
15 | =================================================================== | ||
16 | --- perl-5.12.2.orig/Cross/Makefile-cross-SH | ||
17 | +++ perl-5.12.2/Cross/Makefile-cross-SH | ||
18 | @@ -727,7 +727,7 @@ fi | ||
19 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
20 | |||
21 | .PHONY: preplibrary | ||
22 | -preplibrary: miniperl $(CONFIGPM) lib/lib.pm lib/re.pm $(PREPLIBRARY_LIBPERL) | ||
23 | +preplibrary: miniperl $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) | ||
24 | |||
25 | .PHONY: makeppport | ||
26 | makeppport: miniperl$(EXE_EXT) $(CONFIGPM) | ||
27 | @@ -748,10 +748,6 @@ $(plextract): miniperl $(CONFIGPM) x2p/s | ||
28 | @-rm -f $@ | ||
29 | $(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL | ||
30 | |||
31 | -lib/lib.pm: miniperl $(CONFIGPM) | ||
32 | - @-rm -f $@ | ||
33 | - $(LDLIBPTH) ./miniperl -Ilib -MCross lib/lib_pm.PL | ||
34 | - | ||
35 | lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl | ||
36 | $(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl | ||
37 | |||
38 | @@ -1212,7 +1208,7 @@ minitest.prep: | ||
39 | |||
40 | # Can't depend on lib/Config.pm because that might be where miniperl | ||
41 | # is crashing. | ||
42 | -minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep | ||
43 | +minitest: miniperl$(EXE_EXT) minitest.prep | ||
44 | - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ | ||
45 | && $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty | ||
46 | |||
47 | Index: perl-5.12.2/Makefile.SH | ||
48 | =================================================================== | ||
49 | --- perl-5.12.2.orig/Makefile.SH | ||
50 | +++ perl-5.12.2/Makefile.SH | ||
51 | @@ -970,7 +970,7 @@ esac | ||
52 | $spitshell >>$Makefile <<'!NO!SUBS!' | ||
53 | |||
54 | .PHONY: preplibrary | ||
55 | -preplibrary: $(MINIPERL_EXE) $(CONFIGPM) lib/re.pm $(PREPLIBRARY_LIBPERL) | ||
56 | +preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL) | ||
57 | |||
58 | $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD) | ||
59 | |||
60 | @@ -980,10 +980,6 @@ $(CONFIGPOD): config.sh $(MINIPERL_EXE) | ||
61 | lib/ExtUtils/Miniperl.pm: miniperlmain.c $(MINIPERL_EXE) minimod.pl $(CONFIGPM) | ||
62 | $(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm | ||
63 | |||
64 | -lib/re.pm: ext/re/re.pm | ||
65 | - @-rm -f $@ | ||
66 | - cp ext/re/re.pm lib/re.pm | ||
67 | - | ||
68 | $(plextract): $(MINIPERL_EXE) $(CONFIGPM) x2p/s2p $(dynamic_ext) | ||
69 | @-rm -f $@ | ||
70 | $(MINIPERL) $@.PL | ||
71 | @@ -1267,7 +1263,7 @@ _cleaner2: | ||
72 | rm -f lib/.exists lib/*/.exists lib/*/*/.exists | ||
73 | rm -f h2ph.man pstruct | ||
74 | rm -rf .config | ||
75 | - rm -f preload lib/re.pm | ||
76 | + rm -f preload | ||
77 | rm -rf lib/Encode lib/Compress lib/Hash lib/re | ||
78 | rm -rf lib/TAP lib/Module/Pluggable lib/App | ||
79 | rm -rf lib/mro | ||
80 | @@ -1464,7 +1460,7 @@ minitest.prep: | ||
81 | |||
82 | # Can't depend on lib/Config.pm because that might be where miniperl | ||
83 | # is crashing. | ||
84 | -minitest: $(MINIPERL_EXE) lib/re.pm minitest.prep | ||
85 | +minitest: $(MINIPERL_EXE) minitest.prep | ||
86 | - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \ | ||
87 | && $(RUN_PERL) TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty | ||
88 | |||
89 | Index: perl-5.12.2/vms/descrip_mms.template | ||
90 | =================================================================== | ||
91 | --- perl-5.12.2.orig/vms/descrip_mms.template | ||
92 | +++ perl-5.12.2/vms/descrip_mms.template | ||
93 | @@ -360,7 +360,7 @@ CRTLOPTS =,$(CRTL)/Options | ||
94 | unidatadirs = lib/unicore/To lib/unicore/lib | ||
95 | |||
96 | # Modules which must be installed before we can build extensions | ||
97 | -LIBPREREQ = $(ARCHDIR)Config.pm $(ARCHDIR)Config_heavy.pl [.lib.VMS]Filespec.pm $(ARCHDIR)vmspipe.com [.lib]re.pm [.lib]buildcustomize.pl | ||
98 | +LIBPREREQ = $(ARCHDIR)Config.pm $(ARCHDIR)Config_heavy.pl [.lib.VMS]Filespec.pm $(ARCHDIR)vmspipe.com [.lib]buildcustomize.pl | ||
99 | |||
100 | utils1 = [.lib.pods]perldoc.com [.lib.ExtUtils]Miniperl.pm [.utils]c2ph.com [.utils]h2ph.com | ||
101 | utils2 = [.utils]h2xs.com [.utils]libnetcfg.com [.lib]perlbug.com [.utils]dprofpp.com | ||
102 | @@ -455,9 +455,6 @@ pod = $(pod0) $(pod1) $(pod2) $(pod3) $( | ||
103 | archcorefiles : $(ac) $(ARCHAUTO)time.stamp | ||
104 | @ $(NOOP) | ||
105 | |||
106 | -[.lib]re.pm : [.ext.re]re.pm | ||
107 | - Copy/NoConfirm/Log $(MMS$SOURCE) [.lib] | ||
108 | - | ||
109 | [.lib]buildcustomize.pl : write_buildcustomize.pl $(MINIPERL_EXE) | ||
110 | $(MINIPERL) write_buildcustomize.pl > [.lib]buildcustomize.pl | ||
111 | |||
112 | @@ -1487,7 +1484,7 @@ test_harness : all [.t.lib]vmsfspec.t | ||
113 | - @[.vms]test.com "$(E)" "$(__DEBUG__)" | ||
114 | @ $(MINIPERL) -e "print ""Ran tests"";" > [.t]rantests. | ||
115 | |||
116 | -minitest : $(MINITEST_EXE) [.lib]re.pm [.lib.VMS]Filespec.pm unidatafiles.ts | ||
117 | +minitest : $(MINITEST_EXE) [.lib.VMS]Filespec.pm unidatafiles.ts | ||
118 | @ PERL_TEST_DRIVER == "minitest" | ||
119 | - @[.vms]test.com "$(E)" "$(__DEBUG__)" | ||
120 | |||
121 | Index: perl-5.12.2/win32/Makefile | ||
122 | =================================================================== | ||
123 | --- perl-5.12.2.orig/win32/Makefile | ||
124 | +++ perl-5.12.2/win32/Makefile | ||
125 | @@ -918,7 +918,6 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh c | ||
126 | if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL) | ||
127 | $(XCOPY) ..\*.h $(COREDIR)\*.* | ||
128 | $(XCOPY) *.h $(COREDIR)\*.* | ||
129 | - $(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.* | ||
130 | $(RCOPY) include $(COREDIR)\*.* | ||
131 | -$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)" | ||
132 | if errorlevel 1 $(MAKE) /$(MAKEFLAGS) $(CONFIGPM) | ||
133 | Index: perl-5.12.2/win32/makefile.mk | ||
134 | =================================================================== | ||
135 | --- perl-5.12.2.orig/win32/makefile.mk | ||
136 | +++ perl-5.12.2/win32/makefile.mk | ||
137 | @@ -1210,7 +1210,6 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh c | ||
138 | if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL) | ||
139 | $(XCOPY) ..\*.h $(COREDIR)\*.* | ||
140 | $(XCOPY) *.h $(COREDIR)\*.* | ||
141 | - $(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.* | ||
142 | $(RCOPY) include $(COREDIR)\*.* | ||
143 | $(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)" \ | ||
144 | || $(MAKE) $(MAKEMACROS) $(CONFIGPM) $(MAKEFILE) | ||
145 | Index: perl-5.12.2/write_buildcustomize.pl | ||
146 | =================================================================== | ||
147 | --- perl-5.12.2.orig/write_buildcustomize.pl | ||
148 | +++ perl-5.12.2/write_buildcustomize.pl | ||
149 | @@ -24,6 +24,7 @@ my @toolchain = qw(cpan/AutoLoader/lib | ||
150 | cpan/ExtUtils-MakeMaker/lib | ||
151 | dist/ExtUtils-Manifest/lib | ||
152 | cpan/File-Path/lib | ||
153 | + ext/re | ||
154 | ); | ||
155 | |||
156 | # Used only in ExtUtils::Liblist::Kid::_win32_ext() | ||