diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl/Makefile.SH.patch')
| -rw-r--r-- | meta/recipes-devtools/perl/perl/Makefile.SH.patch | 82 |
1 files changed, 44 insertions, 38 deletions
diff --git a/meta/recipes-devtools/perl/perl/Makefile.SH.patch b/meta/recipes-devtools/perl/perl/Makefile.SH.patch index fd8237fe796..e3e45192979 100644 --- a/meta/recipes-devtools/perl/perl/Makefile.SH.patch +++ b/meta/recipes-devtools/perl/perl/Makefile.SH.patch @@ -1,7 +1,8 @@ -From 4dd9f3f81d8c81c96ff1ea0890ea55685f28b7e9 Mon Sep 17 00:00:00 2001 +From 58b0bb026371235bdcf3ee36106f19b045488619 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 1 Jul 2014 15:51:53 +0800 -Subject: [PATCH 28/49] perl, perl-native, perl-ptest: upgrade from 5.14.3 to +Subject: [PATCH 29/49] perl, perl-native, perl-ptest: upgrade from 5.14.3 to + 5.20.0 Upstream-Status:Inappropriate [embedded specific] @@ -9,11 +10,11 @@ Upstream-Status:Inappropriate [embedded specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - Makefile.SH | 147 ++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 68 insertions(+), 79 deletions(-) + Makefile.SH | 153 ++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 72 insertions(+), 81 deletions(-) diff --git a/Makefile.SH b/Makefile.SH -index 916b332..b143d46 100755 +index 598abdf..3f95b11 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -48,10 +48,10 @@ case "$useshrplib" in @@ -67,7 +68,7 @@ index 916b332..b143d46 100755 ;; os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" ;; -@@ -596,13 +586,23 @@ splintfiles = $(c1) +@@ -618,13 +608,23 @@ lintflags = \ @echo `$(CCCMDSRC)` -S $*.c @`$(CCCMDSRC)` -S $*.c @@ -97,7 +98,7 @@ index 916b332..b143d46 100755 @touch $(MANIFEST_SRT) .PHONY: all utilities -@@ -611,7 +611,7 @@ $(MANIFEST_SRT): MANIFEST $(PERL_EXE) +@@ -633,7 +633,7 @@ $(MANIFEST_SRT): MANIFEST $(PERL_EXE) # by make_patchnum.pl. git_version.h: lib/Config_git.pl @@ -106,7 +107,7 @@ index 916b332..b143d46 100755 $(MINIPERL) make_patchnum.pl # make sure that we recompile perl.c if the git version changes -@@ -624,7 +624,7 @@ perl$(OBJ_EXT): git_version.h +@@ -646,7 +646,7 @@ perl$(OBJ_EXT): git_version.h # loading, we need to build perl first. case "$usedl$static_cwd" in defineundef) @@ -115,25 +116,31 @@ index 916b332..b143d46 100755 ;; definedefine) util_deps='$(PERL_EXE) $(CONFIGPM) FORCE' -@@ -634,7 +634,7 @@ definedefine) +@@ -656,8 +656,9 @@ definedefine) esac $spitshell >>$Makefile <<!GROK!THIS! -utils/Makefile: \$(MINIPERL_EXE) \$(CONFIGPM) utils/Makefile.PL +- \$(MINIPERL) utils/Makefile.PL ++ +utils/Makefile: \$(CONFIGPM) utils/Makefile.PL - \$(MINIPERL) -Ilib utils/Makefile.PL ++ \$(MINIPERL) -Ilib utils/Makefile.PL utilities: utils/Makefile $util_deps -@@ -743,7 +743,7 @@ ext.libs: $(static_ext) + @echo " "; echo " Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all +@@ -765,8 +766,9 @@ ext.libs: $(static_ext) ;; *) $spitshell >>$Makefile <<'!NO!SUBS!' -perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib +- $(MINIPERL) -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext) ++ +perlmain.c: ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm - $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext) ++ $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext) # The file ext.libs is a list of libraries that must be linked in -@@ -806,7 +806,7 @@ PERLEXPORT = perl.exp + # for static extensions, e.g. -lm -lgdbm, etc. The individual +@@ -828,7 +830,7 @@ PERLEXPORT = perl.exp ;; esac $spitshell >>$Makefile <<'!NO!SUBS!' @@ -142,7 +149,7 @@ index 916b332..b143d46 100755 ./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp !NO!SUBS! -@@ -815,7 +815,7 @@ os2) +@@ -837,7 +839,7 @@ os2) $spitshell >>$Makefile <<'!NO!SUBS!' MINIPERLEXP = miniperl @@ -151,7 +158,7 @@ index 916b332..b143d46 100755 ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def !NO!SUBS! -@@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOADER) $(LIBPERLEXPORT) +@@ -913,7 +915,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLEXPORT) true) $spitshell >>$Makefile <<'!NO!SUBS!' rm -f $@ @@ -160,7 +167,7 @@ index 916b332..b143d46 100755 !NO!SUBS! case "$osname" in aix) -@@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl +@@ -971,15 +973,19 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl $spitshell >>$Makefile <<'!NO!SUBS!' lib/buildcustomize.pl: $& $(miniperl_objs) $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs) @@ -183,7 +190,7 @@ index 916b332..b143d46 100755 $(MINIPERL) -f write_buildcustomize.pl !NO!SUBS! ;; -@@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl +@@ -1001,7 +1007,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl -@rm -f miniperl.xok $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ $(miniperl_objs) $(libs) @@ -194,7 +201,7 @@ index 916b332..b143d46 100755 $(MINIPERL) -f write_buildcustomize.pl !NO!SUBS! ;; -@@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_objs) write_buildcustomize.pl +@@ -1012,7 +1020,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_dep) write_buildcustomize.pl -@rm -f miniperl.xok -@rm \$(MINIPERL_EXE) \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) @@ -205,7 +212,7 @@ index 916b332..b143d46 100755 \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" !GROK!THIS! else -@@ -986,7 +994,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl +@@ -1021,7 +1031,9 @@ lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl -@rm -f miniperl.xok $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ $(miniperl_objs) $(libs) @@ -216,7 +223,7 @@ index 916b332..b143d46 100755 $(MINIPERL) -f write_buildcustomize.pl !NO!SUBS! fi -@@ -1036,7 +1046,7 @@ case "${osname}" in +@@ -1071,7 +1083,7 @@ case "${osname}" in catamount) $spitshell >>$Makefile <<!GROK!THIS! .PHONY: makeppport @@ -225,7 +232,7 @@ index 916b332..b143d46 100755 -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \ (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \ done -@@ -1046,7 +1056,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) +@@ -1081,7 +1093,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) *) $spitshell >>$Makefile <<'!NO!SUBS!' .PHONY: makeppport @@ -234,7 +241,7 @@ index 916b332..b143d46 100755 $(MINIPERL) mkppport !NO!SUBS! -@@ -1056,16 +1066,16 @@ esac +@@ -1091,16 +1103,16 @@ esac $spitshell >>$Makefile <<'!NO!SUBS!' .PHONY: preplibrary @@ -254,7 +261,7 @@ index 916b332..b143d46 100755 $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p # Commented out so always runs, mktables looks at far more files than we # can in this makefile to decide if needs to run or not -@@ -1074,12 +1084,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) +@@ -1109,12 +1121,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 # But also this ensures that all extensions are built before we try to scan # them, which picks up Devel::PPPort's documentation. @@ -270,16 +277,16 @@ index 916b332..b143d46 100755 $(MINIPERL) autodoc.pl pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST -@@ -1089,7 +1099,7 @@ pod/perl5240delta.pod: pod/perldelta.pod - $(RMS) pod/perl5240delta.pod - $(LNS) perldelta.pod pod/perl5240delta.pod +@@ -1124,7 +1136,7 @@ pod/perl5261delta.pod: pod/perldelta.pod + $(RMS) pod/perl5261delta.pod + $(LNS) perldelta.pod pod/perl5261delta.pod -extra.pods: $(MINIPERL_EXE) +extra.pods: -@test ! -f extra.pods || rm -f `cat extra.pods` -@rm -f extra.pods -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ -@@ -1133,8 +1143,7 @@ EOT +@@ -1168,8 +1180,7 @@ EOT $spitshell >>$Makefile <<EOT install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman @@ -289,7 +296,7 @@ index 916b332..b143d46 100755 EOT fi -@@ -1144,11 +1153,7 @@ done +@@ -1179,11 +1190,7 @@ done if test "X$hostperl" != X; then $spitshell >>$Makefile <<'!NO!SUBS!' install.perl: $(INSTALL_DEPENDENCE) installperl @@ -302,17 +309,17 @@ index 916b332..b143d46 100755 # XXX Experimental. Hardwired values, but useful for testing. # Eventually Configure could ask for some of these values. -@@ -1166,24 +1171,8 @@ install.html: all installhtml +@@ -1201,24 +1208,8 @@ install.html: all installhtml else $spitshell >>$Makefile <<'!NO!SUBS!' install.perl: $(INSTALL_DEPENDENCE) installperl - $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) - -@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` -- --install.man: all installman -- $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) +-install.man: all installman +- $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) +- -# XXX Experimental. Hardwired values, but useful for testing. -# Eventually Configure could ask for some of these values. -install.html: all installhtml @@ -328,7 +335,7 @@ index 916b332..b143d46 100755 !NO!SUBS! fi -@@ -1275,13 +1264,13 @@ manicheck: FORCE +@@ -1310,13 +1301,13 @@ manicheck: FORCE # # DynaLoader may be needed for extensions that use Makefile.PL. @@ -345,7 +352,7 @@ index 916b332..b143d46 100755 $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE -@@ -1479,14 +1468,14 @@ test_prep_pre: preplibrary utilities $(nonxs_ext) +@@ -1514,14 +1505,14 @@ test_prep_pre: preplibrary utilities $(nonxs_ext) case "$targethost" in '') $spitshell >>$Makefile <<'!NO!SUBS!' @@ -362,7 +369,7 @@ index 916b332..b143d46 100755 \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \ \$(generated_pods) $to libperl.* -@@ -1539,7 +1528,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE +@@ -1574,7 +1565,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE esac $spitshell >>$Makefile <<'!NO!SUBS!' @@ -371,7 +378,7 @@ index 916b332..b143d46 100755 $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) !NO!SUBS! -@@ -1600,7 +1589,7 @@ minitest_prep: +@@ -1635,7 +1626,7 @@ minitest_prep: MINITEST_TESTS = base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t @@ -380,6 +387,5 @@ index 916b332..b143d46 100755 - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty) minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep --- -2.1.4 + |