summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl/Makefile.SH.patch
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-11-24 15:06:04 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:08 +0000
commit066ac716e397e685e429095e2899227c89852122 (patch)
tree090b2c3b91bcf69d85e281ed7072c0554a282515 /meta/recipes-devtools/perl/perl/Makefile.SH.patch
parent50f5c4e9113513bf63e5adf77f091d8bf5831fc4 (diff)
downloadpoky-066ac716e397e685e429095e2899227c89852122.tar.gz
perl: Upgrade to 5.24.0
Configuration changes, Simple changes was made to bump version and api version, related to floating point handling now the configuration needs the inf, mantisa and nan bytes. The new version comes with the support of API calls like memmem and {new,free,use}locale also structure for handle siginfo supported by glibc and musl. Finally use64bit{int, all} was disable because the previous configure_args don't come with them and cases some tests to fail related to bignum's and shared memory respectively. This doesn't means that perl couldn't use 64-bit data types, it means that don't stores by default into a 64 bit that is good for embedded space purposes. Modules changes, Some core modules are now deprecated in order to use the core ones like version-vpp and version-regex inside module-extutils-makemaker. For full review see perl-rdepends.inc file. Patches rebased, - perl/debian/errno_ver.diff - perl/dynaloaderhack.patch - perl/Makefile.SH.patch - perl/config.s - perl/dynaloaderhack.patch - perl/perl-test-customized.patch Patches removed, comes with the upgrade now: - perl/perl-remove-nm-from-libswanted.patch - perl/perl-fix-CVE-2015-8607.patch - perl/perl-fix-CVE-2016-2381.patch Test, The upgrade was test using ptest the suite is fixed now. The pod2man and pod2text installation required now for some tests. Buildhistory was use to review the changes and only diff changes related to modules commented above. (From OE-Core rev: add5e5982f010e13e3ad25690f01d5e4e391daf9) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl/Makefile.SH.patch')
-rw-r--r--meta/recipes-devtools/perl/perl/Makefile.SH.patch114
1 files changed, 62 insertions, 52 deletions
diff --git a/meta/recipes-devtools/perl/perl/Makefile.SH.patch b/meta/recipes-devtools/perl/perl/Makefile.SH.patch
index edf49d60e4..fd8237fe79 100644
--- a/meta/recipes-devtools/perl/perl/Makefile.SH.patch
+++ b/meta/recipes-devtools/perl/perl/Makefile.SH.patch
@@ -1,15 +1,22 @@
1From 4dd9f3f81d8c81c96ff1ea0890ea55685f28b7e9 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 1 Jul 2014 15:51:53 +0800
4Subject: [PATCH 28/49] perl, perl-native, perl-ptest: upgrade from 5.14.3 to
5 5.20.0
6
1Upstream-Status:Inappropriate [embedded specific] 7Upstream-Status:Inappropriate [embedded specific]
2 8
3Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10
4--- 11---
5 Makefile.SH | 145 +++++++++++++++++++++++++++-------------------------------- 12 Makefile.SH | 147 ++++++++++++++++++++++++++++--------------------------------
6 1 file changed, 67 insertions(+), 78 deletions(-) 13 1 file changed, 68 insertions(+), 79 deletions(-)
7 14
8Index: perl-5.22.1/Makefile.SH 15diff --git a/Makefile.SH b/Makefile.SH
9=================================================================== 16index 916b332..b143d46 100755
10--- perl-5.22.1.orig/Makefile.SH 17--- a/Makefile.SH
11+++ perl-5.22.1/Makefile.SH 18+++ b/Makefile.SH
12@@ -39,10 +39,10 @@ case "$useshrplib" in 19@@ -48,10 +48,10 @@ case "$useshrplib" in
13 true) 20 true)
14 # Prefix all runs of 'miniperl' and 'perl' with 21 # Prefix all runs of 'miniperl' and 'perl' with
15 # $ldlibpth so that ./perl finds *this* shared libperl. 22 # $ldlibpth so that ./perl finds *this* shared libperl.
@@ -24,7 +31,7 @@ Index: perl-5.22.1/Makefile.SH
24 31
25 pldlflags="$cccdlflags" 32 pldlflags="$cccdlflags"
26 static_ldflags='' 33 static_ldflags=''
27@@ -122,10 +122,11 @@ true) 34@@ -131,10 +131,11 @@ true)
28 *) 35 *)
29 eval "ldlibpthval=\"\$$ldlibpthname\"" 36 eval "ldlibpthval=\"\$$ldlibpthname\""
30 37
@@ -40,7 +47,7 @@ Index: perl-5.22.1/Makefile.SH
40 47
41 ;; 48 ;;
42 esac 49 esac
43@@ -141,18 +142,7 @@ true) 50@@ -150,18 +151,7 @@ true)
44 # INSTALL file, under "Building a shared perl library". 51 # INSTALL file, under "Building a shared perl library".
45 # If there is no pre-existing $libperl, we don't need 52 # If there is no pre-existing $libperl, we don't need
46 # to do anything further. 53 # to do anything further.
@@ -60,17 +67,13 @@ Index: perl-5.22.1/Makefile.SH
60 ;; 67 ;;
61 os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" 68 os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
62 ;; 69 ;;
63@@ -566,13 +556,23 @@ splintfiles = $(c1) 70@@ -596,13 +586,23 @@ splintfiles = $(c1)
64 @echo `$(CCCMDSRC)` -S $*.c 71 @echo `$(CCCMDSRC)` -S $*.c
65 @`$(CCCMDSRC)` -S $*.c 72 @`$(CCCMDSRC)` -S $*.c
66 73
67-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)
68- @echo " "; 75- @echo " ";
69- @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."
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)
74+#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) 77+#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT)
75+# @echo " "; 78+# @echo " ";
76+# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." 79+# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
@@ -80,7 +83,10 @@ Index: perl-5.22.1/Makefile.SH
80+more: $(generated_pods) $(private) $(public) 83+more: $(generated_pods) $(private) $(public)
81+ 84+
82+more2: $(dynamic_ext) 85+more2: $(dynamic_ext)
83+ 86
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)
84+more3: $(nonxs_ext) 90+more3: $(nonxs_ext)
85+ 91+
86+more4: extras.make $(MANIFEST_SRT) 92+more4: extras.make $(MANIFEST_SRT)
@@ -91,7 +97,7 @@ Index: perl-5.22.1/Makefile.SH
91 @touch $(MANIFEST_SRT) 97 @touch $(MANIFEST_SRT)
92 98
93 .PHONY: all utilities 99 .PHONY: all utilities
94@@ -581,7 +581,7 @@ $(MANIFEST_SRT): MANIFEST $(PERL_EXE) 100@@ -611,7 +611,7 @@ $(MANIFEST_SRT): MANIFEST $(PERL_EXE)
95 # by make_patchnum.pl. 101 # by make_patchnum.pl.
96 git_version.h: lib/Config_git.pl 102 git_version.h: lib/Config_git.pl
97 103
@@ -100,7 +106,7 @@ Index: perl-5.22.1/Makefile.SH
100 $(MINIPERL) make_patchnum.pl 106 $(MINIPERL) make_patchnum.pl
101 107
102 # make sure that we recompile perl.c if the git version changes 108 # make sure that we recompile perl.c if the git version changes
103@@ -594,7 +594,7 @@ perl$(OBJ_EXT): git_version.h 109@@ -624,7 +624,7 @@ perl$(OBJ_EXT): git_version.h
104 # loading, we need to build perl first. 110 # loading, we need to build perl first.
105 case "$usedl$static_cwd" in 111 case "$usedl$static_cwd" in
106 defineundef) 112 defineundef)
@@ -109,7 +115,7 @@ Index: perl-5.22.1/Makefile.SH
109 ;; 115 ;;
110 definedefine) 116 definedefine)
111 util_deps='$(PERL_EXE) $(CONFIGPM) FORCE' 117 util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
112@@ -604,7 +604,7 @@ definedefine) 118@@ -634,7 +634,7 @@ definedefine)
113 esac 119 esac
114 120
115 $spitshell >>$Makefile <<!GROK!THIS! 121 $spitshell >>$Makefile <<!GROK!THIS!
@@ -118,16 +124,16 @@ Index: perl-5.22.1/Makefile.SH
118 \$(MINIPERL) -Ilib utils/Makefile.PL 124 \$(MINIPERL) -Ilib utils/Makefile.PL
119 125
120 utilities: utils/Makefile $util_deps 126 utilities: utils/Makefile $util_deps
121@@ -699,7 +699,7 @@ esac 127@@ -743,7 +743,7 @@ ext.libs: $(static_ext)
122 128 ;;
123 129 *)
124 $spitshell >>$Makefile <<'!NO!SUBS!' 130 $spitshell >>$Makefile <<'!NO!SUBS!'
125-perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib 131-perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib
126+perlmain.c: ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm 132+perlmain.c: ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
127 $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext) 133 $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext)
128 134
129 # The file ext.libs is a list of libraries that must be linked in 135 # The file ext.libs is a list of libraries that must be linked in
130@@ -760,7 +760,7 @@ PERLEXPORT = perl.exp 136@@ -806,7 +806,7 @@ PERLEXPORT = perl.exp
131 ;; 137 ;;
132 esac 138 esac
133 $spitshell >>$Makefile <<'!NO!SUBS!' 139 $spitshell >>$Makefile <<'!NO!SUBS!'
@@ -136,7 +142,7 @@ Index: perl-5.22.1/Makefile.SH
136 ./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp 142 ./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp
137 143
138 !NO!SUBS! 144 !NO!SUBS!
139@@ -769,7 +769,7 @@ os2) 145@@ -815,7 +815,7 @@ os2)
140 $spitshell >>$Makefile <<'!NO!SUBS!' 146 $spitshell >>$Makefile <<'!NO!SUBS!'
141 MINIPERLEXP = miniperl 147 MINIPERLEXP = miniperl
142 148
@@ -145,19 +151,19 @@ Index: perl-5.22.1/Makefile.SH
145 ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def 151 ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def
146 152
147 !NO!SUBS! 153 !NO!SUBS!
148@@ -829,7 +829,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI 154@@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOADER) $(LIBPERLEXPORT)
149 true) 155 true)
150 $spitshell >>$Makefile <<'!NO!SUBS!' 156 $spitshell >>$Makefile <<'!NO!SUBS!'
151 rm -f $@ 157 rm -f $@
152- $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) 158- $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs)
153+ $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5 159+ $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5
154 !NO!SUBS! 160 !NO!SUBS!
155 case "$osname" in 161 case "$osname" in
156 aix) 162 aix)
157@@ -877,7 +877,9 @@ $(MINIPERL_EXE): lib/buildcustomize.pl 163@@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
158 $spitshell >>$Makefile <<'!NO!SUBS!' 164 $spitshell >>$Makefile <<'!NO!SUBS!'
159 lib/buildcustomize.pl: $& $(mini_obj) 165 lib/buildcustomize.pl: $& $(miniperl_objs)
160 $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(mini_obj) $(libs) 166 $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs)
161- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' 167- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
162+ mv -f miniperl miniperl-target 168+ mv -f miniperl miniperl-target
163+ ln -s hostperl miniperl 169+ ln -s hostperl miniperl
@@ -165,21 +171,22 @@ Index: perl-5.22.1/Makefile.SH
165 $(MINIPERL) -f write_buildcustomize.pl 171 $(MINIPERL) -f write_buildcustomize.pl
166 !NO!SUBS! 172 !NO!SUBS!
167 ;; 173 ;;
168@@ -885,7 +887,9 @@ lib/buildcustomize.pl: $& $(mini_obj) 174 next4*)
169 $spitshell >>$Makefile <<'!NO!SUBS!' 175 $spitshell >>$Makefile <<'!NO!SUBS!'
170 lib/buildcustomize.pl: $& $(mini_obj) write ldcustomize.pl 176 lib/buildcustomize.pl: $& $(miniperl_objs) write ldcustomize.pl
171 $(CC) -o $(MINIPERL_EXE) $(mini_obj libs) 177- $(CC) -o $(MINIPERL_EXE) $(miniperl_objs libs)
172- $(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' 178- $(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
179+ $(CC) -o $(MINIPERL_EXE) $(miniperl_objs libs)
173+ mv -f miniperl miniperl-target 180+ mv -f miniperl miniperl-target
174+ ln -s hostperl miniperl 181+ ln -s hostperl miniperl
175+ #$(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' 182+ #$(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
176 $(MINIPERL) -f write_buildcustomize.pl 183 $(MINIPERL) -f write_buildcustomize.pl
177 !NO!SUBS! 184 !NO!SUBS!
178 ;; 185 ;;
179@@ -907,7 +911,9 @@ lib/buildcustomize.pl: $& $(mini_obj) wr 186@@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
180 -@rm -f miniperl.xok 187 -@rm -f miniperl.xok
181 $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ 188 $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
182 $(mini_obj) $(libs) 189 $(miniperl_objs) $(libs)
183- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' 190- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
184+ mv -f miniperl miniperl-target 191+ mv -f miniperl miniperl-target
185+ ln -s hostperl miniperl 192+ ln -s hostperl miniperl
@@ -187,7 +194,7 @@ Index: perl-5.22.1/Makefile.SH
187 $(MINIPERL) -f write_buildcustomize.pl 194 $(MINIPERL) -f write_buildcustomize.pl
188 !NO!SUBS! 195 !NO!SUBS!
189 ;; 196 ;;
190@@ -918,7 +924,9 @@ lib/buildcustomize.pl: \$& \$(mini_obj) 197@@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_objs) write_buildcustomize.pl
191 -@rm -f miniperl.xok 198 -@rm -f miniperl.xok
192 -@rm \$(MINIPERL_EXE) 199 -@rm \$(MINIPERL_EXE)
193 \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) 200 \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
@@ -198,10 +205,10 @@ Index: perl-5.22.1/Makefile.SH
198 \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" 205 \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
199 !GROK!THIS! 206 !GROK!THIS!
200 else 207 else
201@@ -927,7 +935,9 @@ lib/buildcustomize.pl: $& $(mini_obj) wr 208@@ -986,7 +994,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
202 -@rm -f miniperl.xok 209 -@rm -f miniperl.xok
203 $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ 210 $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
204 $(mini_obj) $(libs) 211 $(miniperl_objs) $(libs)
205- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' 212- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
206+ mv -f miniperl miniperl-target 213+ mv -f miniperl miniperl-target
207+ ln -s hostperl miniperl 214+ ln -s hostperl miniperl
@@ -209,7 +216,7 @@ Index: perl-5.22.1/Makefile.SH
209 $(MINIPERL) -f write_buildcustomize.pl 216 $(MINIPERL) -f write_buildcustomize.pl
210 !NO!SUBS! 217 !NO!SUBS!
211 fi 218 fi
212@@ -971,7 +981,7 @@ case "${osname}" in 219@@ -1036,7 +1046,7 @@ case "${osname}" in
213 catamount) 220 catamount)
214 $spitshell >>$Makefile <<!GROK!THIS! 221 $spitshell >>$Makefile <<!GROK!THIS!
215 .PHONY: makeppport 222 .PHONY: makeppport
@@ -218,7 +225,7 @@ Index: perl-5.22.1/Makefile.SH
218 -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \ 225 -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \
219 (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \ 226 (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \
220 done 227 done
221@@ -981,7 +991,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM 228@@ -1046,7 +1056,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM)
222 *) 229 *)
223 $spitshell >>$Makefile <<'!NO!SUBS!' 230 $spitshell >>$Makefile <<'!NO!SUBS!'
224 .PHONY: makeppport 231 .PHONY: makeppport
@@ -227,7 +234,7 @@ Index: perl-5.22.1/Makefile.SH
227 $(MINIPERL) mkppport 234 $(MINIPERL) mkppport
228 235
229 !NO!SUBS! 236 !NO!SUBS!
230@@ -991,16 +1001,16 @@ esac 237@@ -1056,16 +1066,16 @@ esac
231 $spitshell >>$Makefile <<'!NO!SUBS!' 238 $spitshell >>$Makefile <<'!NO!SUBS!'
232 239
233 .PHONY: preplibrary 240 .PHONY: preplibrary
@@ -247,7 +254,7 @@ Index: perl-5.22.1/Makefile.SH
247 $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p 254 $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p
248 # Commented out so always runs, mktables looks at far more files than we 255 # Commented out so always runs, mktables looks at far more files than we
249 # can in this makefile to decide if needs to run or not 256 # can in this makefile to decide if needs to run or not
250@@ -1009,12 +1019,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li 257@@ -1074,12 +1084,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
251 # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 258 # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5
252 # But also this ensures that all extensions are built before we try to scan 259 # But also this ensures that all extensions are built before we try to scan
253 # them, which picks up Devel::PPPort's documentation. 260 # them, which picks up Devel::PPPort's documentation.
@@ -263,16 +270,16 @@ Index: perl-5.22.1/Makefile.SH
263 $(MINIPERL) autodoc.pl 270 $(MINIPERL) autodoc.pl
264 271
265 pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST 272 pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
266@@ -1024,7 +1034,7 @@ pod/perl5221delta.pod: pod/perldelta.pod 273@@ -1089,7 +1099,7 @@ pod/perl5240delta.pod: pod/perldelta.pod
267 $(RMS) pod/perl5221delta.pod 274 $(RMS) pod/perl5240delta.pod
268 $(LNS) perldelta.pod pod/perl5221delta.pod 275 $(LNS) perldelta.pod pod/perl5240delta.pod
269 276
270-extra.pods: $(MINIPERL_EXE) 277-extra.pods: $(MINIPERL_EXE)
271+extra.pods: 278+extra.pods:
272 -@test ! -f extra.pods || rm -f `cat extra.pods` 279 -@test ! -f extra.pods || rm -f `cat extra.pods`
273 -@rm -f extra.pods 280 -@rm -f extra.pods
274 -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ 281 -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
275@@ -1068,8 +1078,7 @@ EOT 282@@ -1133,8 +1143,7 @@ EOT
276 $spitshell >>$Makefile <<EOT 283 $spitshell >>$Makefile <<EOT
277 284
278 install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman 285 install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman
@@ -282,7 +289,7 @@ Index: perl-5.22.1/Makefile.SH
282 EOT 289 EOT
283 fi 290 fi
284 291
285@@ -1079,11 +1088,7 @@ done 292@@ -1144,11 +1153,7 @@ done
286 if test "X$hostperl" != X; then 293 if test "X$hostperl" != X; then
287 $spitshell >>$Makefile <<'!NO!SUBS!' 294 $spitshell >>$Makefile <<'!NO!SUBS!'
288 install.perl: $(INSTALL_DEPENDENCE) installperl 295 install.perl: $(INSTALL_DEPENDENCE) installperl
@@ -295,7 +302,7 @@ Index: perl-5.22.1/Makefile.SH
295 302
296 # XXX Experimental. Hardwired values, but useful for testing. 303 # XXX Experimental. Hardwired values, but useful for testing.
297 # Eventually Configure could ask for some of these values. 304 # Eventually Configure could ask for some of these values.
298@@ -1101,24 +1106,8 @@ install.html: all installhtml 305@@ -1166,24 +1171,8 @@ install.html: all installhtml
299 else 306 else
300 $spitshell >>$Makefile <<'!NO!SUBS!' 307 $spitshell >>$Makefile <<'!NO!SUBS!'
301 install.perl: $(INSTALL_DEPENDENCE) installperl 308 install.perl: $(INSTALL_DEPENDENCE) installperl
@@ -321,7 +328,7 @@ Index: perl-5.22.1/Makefile.SH
321 !NO!SUBS! 328 !NO!SUBS!
322 fi 329 fi
323 330
324@@ -1210,13 +1199,13 @@ manicheck: FORCE 331@@ -1275,13 +1264,13 @@ manicheck: FORCE
325 # 332 #
326 # DynaLoader may be needed for extensions that use Makefile.PL. 333 # DynaLoader may be needed for extensions that use Makefile.PL.
327 334
@@ -338,7 +345,7 @@ Index: perl-5.22.1/Makefile.SH
338 $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) 345 $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
339 346
340 n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE 347 n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
341@@ -1405,14 +1394,14 @@ test_prep_pre: preplibrary utilities $(n 348@@ -1479,14 +1468,14 @@ test_prep_pre: preplibrary utilities $(nonxs_ext)
342 349
343 case "$targethost" in 350 case "$targethost" in
344 '') $spitshell >>$Makefile <<'!NO!SUBS!' 351 '') $spitshell >>$Makefile <<'!NO!SUBS!'
@@ -355,7 +362,7 @@ Index: perl-5.22.1/Makefile.SH
355 \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \ 362 \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \
356 \$(generated_pods) 363 \$(generated_pods)
357 $to libperl.* 364 $to libperl.*
358@@ -1465,7 +1454,7 @@ test_prep test-prep: test_prep_pre \$(MI 365@@ -1539,7 +1528,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE
359 esac 366 esac
360 367
361 $spitshell >>$Makefile <<'!NO!SUBS!' 368 $spitshell >>$Makefile <<'!NO!SUBS!'
@@ -364,12 +371,15 @@ Index: perl-5.22.1/Makefile.SH
364 $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic 371 $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
365 cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) 372 cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
366 !NO!SUBS! 373 !NO!SUBS!
367@@ -1526,7 +1515,7 @@ minitest_prep: 374@@ -1600,7 +1589,7 @@ minitest_prep:
368 375
369 MINITEST_TESTS = base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t 376 MINITEST_TESTS = base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t
370 377
371-minitest: $(MINIPERL_EXE) minitest_prep 378-minitest: $(MINIPERL_EXE) minitest_prep
372+minitest: minitest_prep 379+minitest: minitest_prep
373 - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) </dev/tty 380 - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty)
374 381
375 minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep 382 minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep
383--
3842.1.4
385