diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl/Makefile.SH.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl/Makefile.SH.patch | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/meta/recipes-devtools/perl/perl/Makefile.SH.patch b/meta/recipes-devtools/perl/perl/Makefile.SH.patch index fd8237fe79..c1db335e0d 100644 --- a/meta/recipes-devtools/perl/perl/Makefile.SH.patch +++ b/meta/recipes-devtools/perl/perl/Makefile.SH.patch | |||
@@ -12,10 +12,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
12 | Makefile.SH | 147 ++++++++++++++++++++++++++++-------------------------------- | 12 | Makefile.SH | 147 ++++++++++++++++++++++++++++-------------------------------- |
13 | 1 file changed, 68 insertions(+), 79 deletions(-) | 13 | 1 file changed, 68 insertions(+), 79 deletions(-) |
14 | 14 | ||
15 | diff --git a/Makefile.SH b/Makefile.SH | 15 | Index: perl-5.24.1/Makefile.SH |
16 | index 916b332..b143d46 100755 | 16 | =================================================================== |
17 | --- a/Makefile.SH | 17 | --- perl-5.24.1.orig/Makefile.SH |
18 | +++ b/Makefile.SH | 18 | +++ perl-5.24.1/Makefile.SH |
19 | @@ -48,10 +48,10 @@ case "$useshrplib" in | 19 | @@ -48,10 +48,10 @@ case "$useshrplib" in |
20 | true) | 20 | true) |
21 | # Prefix all runs of 'miniperl' and 'perl' with | 21 | # Prefix all runs of 'miniperl' and 'perl' with |
@@ -74,6 +74,10 @@ index 916b332..b143d46 100755 | |||
74 | -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) |
75 | - @echo " "; | 75 | - @echo " "; |
76 | - @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." |
77 | - | ||
78 | -$(MANIFEST_SRT): MANIFEST $(PERL_EXE) | ||
79 | - @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \ | ||
80 | - $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true) | ||
77 | +#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) | 81 | +#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) |
78 | +# @echo " "; | 82 | +# @echo " "; |
79 | +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | 83 | +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." |
@@ -83,10 +87,7 @@ index 916b332..b143d46 100755 | |||
83 | +more: $(generated_pods) $(private) $(public) | 87 | +more: $(generated_pods) $(private) $(public) |
84 | + | 88 | + |
85 | +more2: $(dynamic_ext) | 89 | +more2: $(dynamic_ext) |
86 | 90 | + | |
87 | -$(MANIFEST_SRT): MANIFEST $(PERL_EXE) | ||
88 | - @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \ | ||
89 | - $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true) | ||
90 | +more3: $(nonxs_ext) | 91 | +more3: $(nonxs_ext) |
91 | + | 92 | + |
92 | +more4: extras.make $(MANIFEST_SRT) | 93 | +more4: extras.make $(MANIFEST_SRT) |
@@ -151,7 +152,7 @@ index 916b332..b143d46 100755 | |||
151 | ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def | 152 | ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def |
152 | 153 | ||
153 | !NO!SUBS! | 154 | !NO!SUBS! |
154 | @@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOADER) $(LIBPERLEXPORT) | 155 | @@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOA |
155 | true) | 156 | true) |
156 | $spitshell >>$Makefile <<'!NO!SUBS!' | 157 | $spitshell >>$Makefile <<'!NO!SUBS!' |
157 | rm -f $@ | 158 | rm -f $@ |
@@ -160,7 +161,7 @@ index 916b332..b143d46 100755 | |||
160 | !NO!SUBS! | 161 | !NO!SUBS! |
161 | case "$osname" in | 162 | case "$osname" in |
162 | aix) | 163 | aix) |
163 | @@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl | 164 | @@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_obj |
164 | $spitshell >>$Makefile <<'!NO!SUBS!' | 165 | $spitshell >>$Makefile <<'!NO!SUBS!' |
165 | lib/buildcustomize.pl: $& $(miniperl_objs) | 166 | lib/buildcustomize.pl: $& $(miniperl_objs) |
166 | $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs) | 167 | $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs) |
@@ -183,7 +184,7 @@ index 916b332..b143d46 100755 | |||
183 | $(MINIPERL) -f write_buildcustomize.pl | 184 | $(MINIPERL) -f write_buildcustomize.pl |
184 | !NO!SUBS! | 185 | !NO!SUBS! |
185 | ;; | 186 | ;; |
186 | @@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl | 187 | @@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_obj |
187 | -@rm -f miniperl.xok | 188 | -@rm -f miniperl.xok |
188 | $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ | 189 | $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ |
189 | $(miniperl_objs) $(libs) | 190 | $(miniperl_objs) $(libs) |
@@ -194,7 +195,7 @@ index 916b332..b143d46 100755 | |||
194 | $(MINIPERL) -f write_buildcustomize.pl | 195 | $(MINIPERL) -f write_buildcustomize.pl |
195 | !NO!SUBS! | 196 | !NO!SUBS! |
196 | ;; | 197 | ;; |
197 | @@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_objs) write_buildcustomize.pl | 198 | @@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_o |
198 | -@rm -f miniperl.xok | 199 | -@rm -f miniperl.xok |
199 | -@rm \$(MINIPERL_EXE) | 200 | -@rm \$(MINIPERL_EXE) |
200 | \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) | 201 | \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) |
@@ -205,7 +206,7 @@ index 916b332..b143d46 100755 | |||
205 | \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" | 206 | \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" |
206 | !GROK!THIS! | 207 | !GROK!THIS! |
207 | else | 208 | else |
208 | @@ -986,7 +994,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl | 209 | @@ -986,7 +994,9 @@ lib/buildcustomize.pl: $& $(miniperl_obj |
209 | -@rm -f miniperl.xok | 210 | -@rm -f miniperl.xok |
210 | $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ | 211 | $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ |
211 | $(miniperl_objs) $(libs) | 212 | $(miniperl_objs) $(libs) |
@@ -225,7 +226,7 @@ index 916b332..b143d46 100755 | |||
225 | -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \ | 226 | -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \ |
226 | (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \ | 227 | (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \ |
227 | done | 228 | done |
228 | @@ -1046,7 +1056,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) | 229 | @@ -1046,7 +1056,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM |
229 | *) | 230 | *) |
230 | $spitshell >>$Makefile <<'!NO!SUBS!' | 231 | $spitshell >>$Makefile <<'!NO!SUBS!' |
231 | .PHONY: makeppport | 232 | .PHONY: makeppport |
@@ -254,7 +255,7 @@ index 916b332..b143d46 100755 | |||
254 | $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p | 255 | $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p |
255 | # Commented out so always runs, mktables looks at far more files than we | 256 | # Commented out so always runs, mktables looks at far more files than we |
256 | # can in this makefile to decide if needs to run or not | 257 | # can in this makefile to decide if needs to run or not |
257 | @@ -1074,12 +1084,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) | 258 | @@ -1074,12 +1084,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li |
258 | # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 | 259 | # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 |
259 | # But also this ensures that all extensions are built before we try to scan | 260 | # But also this ensures that all extensions are built before we try to scan |
260 | # them, which picks up Devel::PPPort's documentation. | 261 | # them, which picks up Devel::PPPort's documentation. |
@@ -270,9 +271,9 @@ index 916b332..b143d46 100755 | |||
270 | $(MINIPERL) autodoc.pl | 271 | $(MINIPERL) autodoc.pl |
271 | 272 | ||
272 | pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST | 273 | pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST |
273 | @@ -1089,7 +1099,7 @@ pod/perl5240delta.pod: pod/perldelta.pod | 274 | @@ -1089,7 +1099,7 @@ pod/perl5241delta.pod: pod/perldelta.pod |
274 | $(RMS) pod/perl5240delta.pod | 275 | $(RMS) pod/perl5241delta.pod |
275 | $(LNS) perldelta.pod pod/perl5240delta.pod | 276 | $(LNS) perldelta.pod pod/perl5241delta.pod |
276 | 277 | ||
277 | -extra.pods: $(MINIPERL_EXE) | 278 | -extra.pods: $(MINIPERL_EXE) |
278 | +extra.pods: | 279 | +extra.pods: |
@@ -345,7 +346,7 @@ index 916b332..b143d46 100755 | |||
345 | $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) | 346 | $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) |
346 | 347 | ||
347 | n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE | 348 | n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE |
348 | @@ -1479,14 +1468,14 @@ test_prep_pre: preplibrary utilities $(nonxs_ext) | 349 | @@ -1479,14 +1468,14 @@ test_prep_pre: preplibrary utilities $(n |
349 | 350 | ||
350 | case "$targethost" in | 351 | case "$targethost" in |
351 | '') $spitshell >>$Makefile <<'!NO!SUBS!' | 352 | '') $spitshell >>$Makefile <<'!NO!SUBS!' |
@@ -362,7 +363,7 @@ index 916b332..b143d46 100755 | |||
362 | \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \ | 363 | \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \ |
363 | \$(generated_pods) | 364 | \$(generated_pods) |
364 | $to libperl.* | 365 | $to libperl.* |
365 | @@ -1539,7 +1528,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE | 366 | @@ -1539,7 +1528,7 @@ test_prep test-prep: test_prep_pre \$(MI |
366 | esac | 367 | esac |
367 | 368 | ||
368 | $spitshell >>$Makefile <<'!NO!SUBS!' | 369 | $spitshell >>$Makefile <<'!NO!SUBS!' |
@@ -380,6 +381,3 @@ index 916b332..b143d46 100755 | |||
380 | - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty) | 381 | - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty) |
381 | 382 | ||
382 | minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep | 383 | minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep |
383 | -- | ||
384 | 2.1.4 | ||
385 | |||