diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch b/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch index 103fe978bc..39e5fee577 100644 --- a/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch +++ b/meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch | |||
@@ -166,12 +166,12 @@ Index: perl-5.12.2/Makefile.SH | |||
166 | $(MINIPERL) $(Icwd) mkppport | 166 | $(MINIPERL) $(Icwd) mkppport |
167 | 167 | ||
168 | !NO!SUBS! | 168 | !NO!SUBS! |
169 | @@ -970,30 +979,30 @@ esac | 169 | @@ -970,29 +979,29 @@ esac |
170 | $spitshell >>$Makefile <<'!NO!SUBS!' | 170 | $spitshell >>$Makefile <<'!NO!SUBS!' |
171 | 171 | ||
172 | .PHONY: preplibrary | 172 | .PHONY: preplibrary |
173 | -preplibrary: $(MINIPERL_EXE) $(CONFIGPM) lib/re.pm $(PREPLIBRARY_LIBPERL) | 173 | -preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL) |
174 | +preplibrary: $(CONFIGPM) lib/re.pm $(PREPLIBRARY_LIBPERL) | 174 | +preplibrary: $(CONFIGPM) $(PREPLIBRARY_LIBPERL) |
175 | 175 | ||
176 | $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD) | 176 | $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD) |
177 | 177 | ||
@@ -183,10 +183,6 @@ Index: perl-5.12.2/Makefile.SH | |||
183 | +lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM) | 183 | +lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM) |
184 | $(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm | 184 | $(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm |
185 | 185 | ||
186 | lib/re.pm: ext/re/re.pm | ||
187 | @-rm -f $@ | ||
188 | cp ext/re/re.pm lib/re.pm | ||
189 | |||
190 | -$(plextract): $(MINIPERL_EXE) $(CONFIGPM) x2p/s2p $(dynamic_ext) | 186 | -$(plextract): $(MINIPERL_EXE) $(CONFIGPM) x2p/s2p $(dynamic_ext) |
191 | +$(plextract): $(CONFIGPM) x2p/s2p $(dynamic_ext) | 187 | +$(plextract): $(CONFIGPM) x2p/s2p $(dynamic_ext) |
192 | @-rm -f $@ | 188 | @-rm -f $@ |
@@ -196,6 +192,10 @@ Index: perl-5.12.2/Makefile.SH | |||
196 | +x2p/s2p: $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL | 192 | +x2p/s2p: $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL |
197 | cd x2p; $(LDLIBPTH) $(MAKE) s2p | 193 | cd x2p; $(LDLIBPTH) $(MAKE) s2p |
198 | 194 | ||
195 | -lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl | ||
196 | +lib/buildcustomize.pl: write_buildcustomize.pl | ||
197 | $(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl | ||
198 | |||
199 | unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data | 199 | unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data |
200 | 200 | ||
201 | -uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) | 201 | -uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) |
@@ -203,7 +203,7 @@ Index: perl-5.12.2/Makefile.SH | |||
203 | $(MINIPERL) $(Icwd) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p | 203 | $(MINIPERL) $(Icwd) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p |
204 | # Commented out so always runs, mktables looks at far more files than we | 204 | # Commented out so always runs, mktables looks at far more files than we |
205 | # can in this makefile to decide if needs to run or not | 205 | # can in this makefile to decide if needs to run or not |
206 | @@ -1002,21 +1011,21 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li | 206 | @@ -1001,21 +1010,21 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li |
207 | # $(PERL_EXE) and ext because buildtoc uses Text::Wrap uses re | 207 | # $(PERL_EXE) and ext because buildtoc uses Text::Wrap uses re |
208 | # But also this ensures that all extensions are built before we try to scan | 208 | # But also this ensures that all extensions are built before we try to scan |
209 | # them, which picks up Devel::PPPort's documentation. | 209 | # them, which picks up Devel::PPPort's documentation. |
@@ -230,7 +230,7 @@ Index: perl-5.12.2/Makefile.SH | |||
230 | -@test ! -f extra.pods || rm -f `cat extra.pods` | 230 | -@test ! -f extra.pods || rm -f `cat extra.pods` |
231 | -@rm -f extra.pods | 231 | -@rm -f extra.pods |
232 | -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ | 232 | -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ |
233 | @@ -1059,11 +1068,7 @@ no-install: | 233 | @@ -1058,11 +1067,7 @@ no-install: |
234 | INSTALL_DEPENDENCE = all | 234 | INSTALL_DEPENDENCE = all |
235 | 235 | ||
236 | install.perl: $(INSTALL_DEPENDENCE) installperl | 236 | install.perl: $(INSTALL_DEPENDENCE) installperl |
@@ -243,28 +243,28 @@ Index: perl-5.12.2/Makefile.SH | |||
243 | 243 | ||
244 | # XXX Experimental. Hardwired values, but useful for testing. | 244 | # XXX Experimental. Hardwired values, but useful for testing. |
245 | # Eventually Configure could ask for some of these values. | 245 | # Eventually Configure could ask for some of these values. |
246 | @@ -1160,16 +1165,16 @@ manicheck: FORCE | 246 | @@ -1159,16 +1164,16 @@ manicheck: FORCE |
247 | # | 247 | # |
248 | # DynaLoader may be needed for extensions that use Makefile.PL. | 248 | # DynaLoader may be needed for extensions that use Makefile.PL. |
249 | 249 | ||
250 | -$(DYNALOADER): $(MINIPERL_EXE) preplibrary FORCE $(nonxs_ext) | 250 | -$(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) |
251 | +$(DYNALOADER): preplibrary FORCE $(nonxs_ext) | 251 | +$(DYNALOADER): lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) |
252 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) | 252 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) |
253 | 253 | ||
254 | -d_dummy $(dynamic_ext): $(MINIPERL_EXE) preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) | 254 | -d_dummy $(dynamic_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) |
255 | +d_dummy $(dynamic_ext): preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) | 255 | +d_dummy $(dynamic_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) |
256 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic | 256 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic |
257 | 257 | ||
258 | -s_dummy $(static_ext): $(MINIPERL_EXE) preplibrary makeppport $(DYNALOADER) FORCE | 258 | -s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE |
259 | +s_dummy $(static_ext): preplibrary makeppport $(DYNALOADER) FORCE | 259 | +s_dummy $(static_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE |
260 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) | 260 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) |
261 | 261 | ||
262 | -n_dummy $(nonxs_ext): $(MINIPERL_EXE) preplibrary FORCE | 262 | -n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE |
263 | +n_dummy $(nonxs_ext): preplibrary FORCE | 263 | +n_dummy $(nonxs_ext): lib/buildcustomize.pl preplibrary FORCE |
264 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | 264 | $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) |
265 | !NO!SUBS! | 265 | !NO!SUBS! |
266 | 266 | ||
267 | @@ -1367,10 +1372,10 @@ _test: | 267 | @@ -1366,10 +1371,10 @@ _test: |
268 | 268 | ||
269 | test_prep_pre: preplibrary utilities $(nonxs_ext) | 269 | test_prep_pre: preplibrary utilities $(nonxs_ext) |
270 | 270 | ||
@@ -277,12 +277,12 @@ Index: perl-5.12.2/Makefile.SH | |||
277 | $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic | 277 | $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic |
278 | cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) | 278 | cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) |
279 | 279 | ||
280 | @@ -1461,7 +1466,7 @@ minitest.prep: | 280 | @@ -1460,7 +1465,7 @@ minitest.prep: |
281 | 281 | ||
282 | # Can't depend on lib/Config.pm because that might be where miniperl | 282 | # Can't depend on lib/Config.pm because that might be where miniperl |
283 | # is crashing. | 283 | # is crashing. |
284 | -minitest: $(MINIPERL_EXE) lib/re.pm minitest.prep | 284 | -minitest: $(MINIPERL_EXE) minitest.prep |
285 | +minitest: lib/re.pm minitest.prep | 285 | +minitest: minitest.prep |
286 | - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \ | 286 | - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \ |
287 | && $(RUN_PERL) TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty | 287 | && $(RUN_PERL) TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty |
288 | 288 | ||