diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl/Makefile.SH.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl/Makefile.SH.patch | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/meta/recipes-devtools/perl/perl/Makefile.SH.patch b/meta/recipes-devtools/perl/perl/Makefile.SH.patch index 3de233128d..edf49d60e4 100644 --- a/meta/recipes-devtools/perl/perl/Makefile.SH.patch +++ b/meta/recipes-devtools/perl/perl/Makefile.SH.patch | |||
@@ -5,10 +5,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
5 | Makefile.SH | 145 +++++++++++++++++++++++++++-------------------------------- | 5 | Makefile.SH | 145 +++++++++++++++++++++++++++-------------------------------- |
6 | 1 file changed, 67 insertions(+), 78 deletions(-) | 6 | 1 file changed, 67 insertions(+), 78 deletions(-) |
7 | 7 | ||
8 | diff --git a/Makefile.SH b/Makefile.SH | 8 | Index: perl-5.22.1/Makefile.SH |
9 | index 034d812..67e08fd 100755 | 9 | =================================================================== |
10 | --- a/Makefile.SH | 10 | --- perl-5.22.1.orig/Makefile.SH |
11 | +++ b/Makefile.SH | 11 | +++ perl-5.22.1/Makefile.SH |
12 | @@ -39,10 +39,10 @@ case "$useshrplib" in | 12 | @@ -39,10 +39,10 @@ case "$useshrplib" in |
13 | true) | 13 | true) |
14 | # Prefix all runs of 'miniperl' and 'perl' with | 14 | # Prefix all runs of 'miniperl' and 'perl' with |
@@ -67,6 +67,10 @@ index 034d812..67e08fd 100755 | |||
67 | -all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) | 67 | -all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) |
68 | - @echo " "; | 68 | - @echo " "; |
69 | - @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | 69 | - @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." |
70 | - | ||
71 | -$(MANIFEST_SRT): MANIFEST $(PERL_EXE) | ||
72 | - @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \ | ||
73 | - $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true) | ||
70 | +#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) | 74 | +#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) |
71 | +# @echo " "; | 75 | +# @echo " "; |
72 | +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | 76 | +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." |
@@ -76,10 +80,7 @@ index 034d812..67e08fd 100755 | |||
76 | +more: $(generated_pods) $(private) $(public) | 80 | +more: $(generated_pods) $(private) $(public) |
77 | + | 81 | + |
78 | +more2: $(dynamic_ext) | 82 | +more2: $(dynamic_ext) |
79 | 83 | + | |
80 | -$(MANIFEST_SRT): MANIFEST $(PERL_EXE) | ||
81 | - @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \ | ||
82 | - $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true) | ||
83 | +more3: $(nonxs_ext) | 84 | +more3: $(nonxs_ext) |
84 | + | 85 | + |
85 | +more4: extras.make $(MANIFEST_SRT) | 86 | +more4: extras.make $(MANIFEST_SRT) |
@@ -144,7 +145,7 @@ index 034d812..67e08fd 100755 | |||
144 | ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def | 145 | ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def |
145 | 146 | ||
146 | !NO!SUBS! | 147 | !NO!SUBS! |
147 | @@ -829,7 +829,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT) | 148 | @@ -829,7 +829,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI |
148 | true) | 149 | true) |
149 | $spitshell >>$Makefile <<'!NO!SUBS!' | 150 | $spitshell >>$Makefile <<'!NO!SUBS!' |
150 | rm -f $@ | 151 | rm -f $@ |
@@ -175,7 +176,7 @@ index 034d812..67e08fd 100755 | |||
175 | $(MINIPERL) -f write_buildcustomize.pl | 176 | $(MINIPERL) -f write_buildcustomize.pl |
176 | !NO!SUBS! | 177 | !NO!SUBS! |
177 | ;; | 178 | ;; |
178 | @@ -907,7 +911,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl | 179 | @@ -907,7 +911,9 @@ lib/buildcustomize.pl: $& $(mini_obj) wr |
179 | -@rm -f miniperl.xok | 180 | -@rm -f miniperl.xok |
180 | $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ | 181 | $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ |
181 | $(mini_obj) $(libs) | 182 | $(mini_obj) $(libs) |
@@ -186,7 +187,7 @@ index 034d812..67e08fd 100755 | |||
186 | $(MINIPERL) -f write_buildcustomize.pl | 187 | $(MINIPERL) -f write_buildcustomize.pl |
187 | !NO!SUBS! | 188 | !NO!SUBS! |
188 | ;; | 189 | ;; |
189 | @@ -918,7 +924,9 @@ lib/buildcustomize.pl: \$& \$(mini_obj) write_buildcustomize.pl | 190 | @@ -918,7 +924,9 @@ lib/buildcustomize.pl: \$& \$(mini_obj) |
190 | -@rm -f miniperl.xok | 191 | -@rm -f miniperl.xok |
191 | -@rm \$(MINIPERL_EXE) | 192 | -@rm \$(MINIPERL_EXE) |
192 | \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) | 193 | \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) |
@@ -197,7 +198,7 @@ index 034d812..67e08fd 100755 | |||
197 | \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" | 198 | \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" |
198 | !GROK!THIS! | 199 | !GROK!THIS! |
199 | else | 200 | else |
200 | @@ -927,7 +935,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl | 201 | @@ -927,7 +935,9 @@ lib/buildcustomize.pl: $& $(mini_obj) wr |
201 | -@rm -f miniperl.xok | 202 | -@rm -f miniperl.xok |
202 | $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ | 203 | $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ |
203 | $(mini_obj) $(libs) | 204 | $(mini_obj) $(libs) |
@@ -217,7 +218,7 @@ index 034d812..67e08fd 100755 | |||
217 | -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \ | 218 | -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \ |
218 | (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \ | 219 | (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \ |
219 | done | 220 | done |
220 | @@ -981,7 +991,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) | 221 | @@ -981,7 +991,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM |
221 | *) | 222 | *) |
222 | $spitshell >>$Makefile <<'!NO!SUBS!' | 223 | $spitshell >>$Makefile <<'!NO!SUBS!' |
223 | .PHONY: makeppport | 224 | .PHONY: makeppport |
@@ -246,7 +247,7 @@ index 034d812..67e08fd 100755 | |||
246 | $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p | 247 | $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p |
247 | # Commented out so always runs, mktables looks at far more files than we | 248 | # Commented out so always runs, mktables looks at far more files than we |
248 | # can in this makefile to decide if needs to run or not | 249 | # can in this makefile to decide if needs to run or not |
249 | @@ -1009,12 +1019,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) | 250 | @@ -1009,12 +1019,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li |
250 | # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 | 251 | # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 |
251 | # But also this ensures that all extensions are built before we try to scan | 252 | # But also this ensures that all extensions are built before we try to scan |
252 | # them, which picks up Devel::PPPort's documentation. | 253 | # them, which picks up Devel::PPPort's documentation. |
@@ -262,9 +263,9 @@ index 034d812..67e08fd 100755 | |||
262 | $(MINIPERL) autodoc.pl | 263 | $(MINIPERL) autodoc.pl |
263 | 264 | ||
264 | pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST | 265 | pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST |
265 | @@ -1024,7 +1034,7 @@ pod/perl5220delta.pod: pod/perldelta.pod | 266 | @@ -1024,7 +1034,7 @@ pod/perl5221delta.pod: pod/perldelta.pod |
266 | $(RMS) pod/perl5220delta.pod | 267 | $(RMS) pod/perl5221delta.pod |
267 | $(LNS) perldelta.pod pod/perl5220delta.pod | 268 | $(LNS) perldelta.pod pod/perl5221delta.pod |
268 | 269 | ||
269 | -extra.pods: $(MINIPERL_EXE) | 270 | -extra.pods: $(MINIPERL_EXE) |
270 | +extra.pods: | 271 | +extra.pods: |
@@ -300,11 +301,11 @@ index 034d812..67e08fd 100755 | |||
300 | install.perl: $(INSTALL_DEPENDENCE) installperl | 301 | install.perl: $(INSTALL_DEPENDENCE) installperl |
301 | - $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | 302 | - $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) |
302 | - -@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` | 303 | - -@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` |
303 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | 304 | - |
304 | |||
305 | -install.man: all installman | 305 | -install.man: all installman |
306 | - $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) | 306 | - $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) |
307 | - | 307 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) |
308 | |||
308 | -# XXX Experimental. Hardwired values, but useful for testing. | 309 | -# XXX Experimental. Hardwired values, but useful for testing. |
309 | -# Eventually Configure could ask for some of these values. | 310 | -# Eventually Configure could ask for some of these values. |
310 | -install.html: all installhtml | 311 | -install.html: all installhtml |
@@ -337,7 +338,7 @@ index 034d812..67e08fd 100755 | |||
337 | $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) | 338 | $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) |
338 | 339 | ||
339 | n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE | 340 | n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE |
340 | @@ -1405,14 +1394,14 @@ test_prep_pre: preplibrary utilities $(nonxs_ext) | 341 | @@ -1405,14 +1394,14 @@ test_prep_pre: preplibrary utilities $(n |
341 | 342 | ||
342 | case "$targethost" in | 343 | case "$targethost" in |
343 | '') $spitshell >>$Makefile <<'!NO!SUBS!' | 344 | '') $spitshell >>$Makefile <<'!NO!SUBS!' |
@@ -354,7 +355,7 @@ index 034d812..67e08fd 100755 | |||
354 | \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \ | 355 | \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \ |
355 | \$(generated_pods) | 356 | \$(generated_pods) |
356 | $to libperl.* | 357 | $to libperl.* |
357 | @@ -1465,7 +1454,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE | 358 | @@ -1465,7 +1454,7 @@ test_prep test-prep: test_prep_pre \$(MI |
358 | esac | 359 | esac |
359 | 360 | ||
360 | $spitshell >>$Makefile <<'!NO!SUBS!' | 361 | $spitshell >>$Makefile <<'!NO!SUBS!' |
@@ -363,12 +364,12 @@ index 034d812..67e08fd 100755 | |||
363 | $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic | 364 | $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic |
364 | cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) | 365 | cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) |
365 | !NO!SUBS! | 366 | !NO!SUBS! |
366 | @@ -1516,7 +1505,7 @@ $spitshell >>$Makefile <<'!NO!SUBS!' | 367 | @@ -1526,7 +1515,7 @@ minitest_prep: |
367 | 368 | ||
368 | # Can't depend on lib/Config.pm because that might be where miniperl | 369 | MINITEST_TESTS = base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t |
369 | # is crashing. | 370 | |
370 | -minitest: $(MINIPERL_EXE) | 371 | -minitest: $(MINIPERL_EXE) minitest_prep |
371 | +minitest: | 372 | +minitest: minitest_prep |
372 | -@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles) | 373 | - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) </dev/tty |
373 | @echo " " | 374 | |
374 | @echo "You may see some irrelevant test failures if you have been unable" | 375 | minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep |