Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 4dd9f3f81d8c81c96ff1ea0890ea55685f28b7e9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 1 Jul 2014 15:51:53 +0800 |
| 4 | Subject: [PATCH 28/49] perl, perl-native, perl-ptest: upgrade from 5.14.3 to |
| 5 | 5.20.0 |
| 6 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7 | Upstream-Status:Inappropriate [embedded specific] |
| 8 | |
| 9 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 10 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 11 | --- |
| 12 | Makefile.SH | 147 ++++++++++++++++++++++++++++-------------------------------- |
| 13 | 1 file changed, 68 insertions(+), 79 deletions(-) |
| 14 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 15 | Index: perl-5.24.4/Makefile.SH |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 16 | =================================================================== |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 17 | --- perl-5.24.4.orig/Makefile.SH |
| 18 | +++ perl-5.24.4/Makefile.SH |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 19 | @@ -48,10 +48,10 @@ case "$useshrplib" in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 20 | true) |
| 21 | # Prefix all runs of 'miniperl' and 'perl' with |
| 22 | # $ldlibpth so that ./perl finds *this* shared libperl. |
| 23 | - case "$LD_LIBRARY_PATH" in |
| 24 | - '') ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;; |
| 25 | - *) ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;; |
| 26 | - esac |
| 27 | + #case "$LD_LIBRARY_PATH" in |
| 28 | + #'') ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;; |
| 29 | + #*) ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;; |
| 30 | + #esac |
| 31 | |
| 32 | pldlflags="$cccdlflags" |
| 33 | static_ldflags='' |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 34 | @@ -131,10 +131,11 @@ true) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 35 | *) |
| 36 | eval "ldlibpthval=\"\$$ldlibpthname\"" |
| 37 | |
| 38 | - case "$ldlibpthval" in |
| 39 | - '') ldlibpth="$ldlibpthname=` quote "$pwd" `" ;; |
| 40 | - *) ldlibpth="$ldlibpthname=` quote "$pwd" `:` quote "$ldlibpthval" `" ;; |
| 41 | - esac |
| 42 | +# We compile in the library path in OE from cross-compile, so lets not do this |
| 43 | +# case "$ldlibpthval" in |
| 44 | +# '') ldlibpth="$ldlibpthname=` quote "$pwd" `" ;; |
| 45 | +# *) ldlibpth="$ldlibpthname=` quote "$pwd" `:` quote "$ldlibpthval" `" ;; |
| 46 | +# esac |
| 47 | |
| 48 | ;; |
| 49 | esac |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 50 | @@ -150,18 +151,7 @@ true) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 51 | # INSTALL file, under "Building a shared perl library". |
| 52 | # If there is no pre-existing $libperl, we don't need |
| 53 | # to do anything further. |
| 54 | - if test -f $archlib/CORE/$libperl; then |
| 55 | - rm -f preload |
| 56 | - cat <<'EOT' > preload |
| 57 | -#! /bin/sh |
| 58 | -lib=$1 |
| 59 | -shift |
| 60 | -test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" |
| 61 | -exec "$@" |
| 62 | -EOT |
| 63 | - chmod 755 preload |
| 64 | - ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" |
| 65 | - fi |
| 66 | + echo linux libraries overwritten by cross-compile patches |
| 67 | ;; |
| 68 | os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" |
| 69 | ;; |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 70 | @@ -596,13 +586,23 @@ splintfiles = $(c1) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 71 | @echo `$(CCCMDSRC)` -S $*.c |
| 72 | @`$(CCCMDSRC)` -S $*.c |
| 73 | |
| 74 | -all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) |
| 75 | - @echo " "; |
| 76 | - @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 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) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 81 | +#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) |
| 82 | +# @echo " "; |
| 83 | +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." |
| 84 | + |
| 85 | +all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) miniperl $(unidatafiles) |
| 86 | + |
| 87 | +more: $(generated_pods) $(private) $(public) |
| 88 | + |
| 89 | +more2: $(dynamic_ext) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 90 | + |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 91 | +more3: $(nonxs_ext) |
| 92 | + |
| 93 | +more4: extras.make $(MANIFEST_SRT) |
| 94 | + |
| 95 | +$(MANIFEST_SRT): MANIFEST |
| 96 | + @$(MINIPERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \ |
| 97 | + $(MINIPERL) Porting/manisort -q -o MANIFEST; sh -c true) |
| 98 | @touch $(MANIFEST_SRT) |
| 99 | |
| 100 | .PHONY: all utilities |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 101 | @@ -611,7 +611,7 @@ $(MANIFEST_SRT): MANIFEST $(PERL_EXE) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 102 | # by make_patchnum.pl. |
| 103 | git_version.h: lib/Config_git.pl |
| 104 | |
| 105 | -lib/Config_git.pl: $(MINIPERL_EXE) make_patchnum.pl |
| 106 | +lib/Config_git.pl: make_patchnum.pl |
| 107 | $(MINIPERL) make_patchnum.pl |
| 108 | |
| 109 | # make sure that we recompile perl.c if the git version changes |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 110 | @@ -624,7 +624,7 @@ perl$(OBJ_EXT): git_version.h |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 111 | # loading, we need to build perl first. |
| 112 | case "$usedl$static_cwd" in |
| 113 | defineundef) |
| 114 | - util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE' |
| 115 | + util_deps='$(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE' |
| 116 | ;; |
| 117 | definedefine) |
| 118 | util_deps='$(PERL_EXE) $(CONFIGPM) FORCE' |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 119 | @@ -634,7 +634,7 @@ definedefine) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 120 | esac |
| 121 | |
| 122 | $spitshell >>$Makefile <<!GROK!THIS! |
| 123 | -utils/Makefile: \$(MINIPERL_EXE) \$(CONFIGPM) utils/Makefile.PL |
| 124 | +utils/Makefile: \$(CONFIGPM) utils/Makefile.PL |
| 125 | \$(MINIPERL) -Ilib utils/Makefile.PL |
| 126 | |
| 127 | utilities: utils/Makefile $util_deps |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 128 | @@ -743,7 +743,7 @@ ext.libs: $(static_ext) |
| 129 | ;; |
| 130 | *) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 131 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 132 | -perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib |
| 133 | +perlmain.c: ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm |
| 134 | $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext) |
| 135 | |
| 136 | # The file ext.libs is a list of libraries that must be linked in |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 137 | @@ -806,7 +806,7 @@ PERLEXPORT = perl.exp |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 138 | ;; |
| 139 | esac |
| 140 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 141 | -perl.exp: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) |
| 142 | +perl.exp: makedef.pl $(CONFIGPM) $(SYM) $(SYMH) |
| 143 | ./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp |
| 144 | |
| 145 | !NO!SUBS! |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 146 | @@ -815,7 +815,7 @@ os2) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 147 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 148 | MINIPERLEXP = miniperl |
| 149 | |
| 150 | -perl5.def: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map |
| 151 | +perl5.def: makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map |
| 152 | ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def |
| 153 | |
| 154 | !NO!SUBS! |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 155 | @@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOA |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 156 | true) |
| 157 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 158 | rm -f $@ |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 159 | - $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs) |
| 160 | + $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 161 | !NO!SUBS! |
| 162 | case "$osname" in |
| 163 | aix) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 164 | @@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_obj |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 165 | $spitshell >>$Makefile <<'!NO!SUBS!' |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 166 | lib/buildcustomize.pl: $& $(miniperl_objs) |
| 167 | $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 168 | - $(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' |
| 169 | + mv -f miniperl miniperl-target |
| 170 | + ln -s hostperl miniperl |
| 171 | + #$(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' |
| 172 | $(MINIPERL) -f write_buildcustomize.pl |
| 173 | !NO!SUBS! |
| 174 | ;; |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 175 | next4*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 176 | $spitshell >>$Makefile <<'!NO!SUBS!' |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 177 | lib/buildcustomize.pl: $& $(miniperl_objs) write ldcustomize.pl |
| 178 | - $(CC) -o $(MINIPERL_EXE) $(miniperl_objs libs) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 179 | - $(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' |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 180 | + $(CC) -o $(MINIPERL_EXE) $(miniperl_objs libs) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 181 | + mv -f miniperl miniperl-target |
| 182 | + ln -s hostperl miniperl |
| 183 | + #$(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' |
| 184 | $(MINIPERL) -f write_buildcustomize.pl |
| 185 | !NO!SUBS! |
| 186 | ;; |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 187 | @@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_obj |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 188 | -@rm -f miniperl.xok |
| 189 | $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 190 | $(miniperl_objs) $(libs) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 191 | - $(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' |
| 192 | + mv -f miniperl miniperl-target |
| 193 | + ln -s hostperl miniperl |
| 194 | + #$(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' |
| 195 | $(MINIPERL) -f write_buildcustomize.pl |
| 196 | !NO!SUBS! |
| 197 | ;; |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 198 | @@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_o |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 199 | -@rm -f miniperl.xok |
| 200 | -@rm \$(MINIPERL_EXE) |
| 201 | \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) |
| 202 | - \$(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' |
| 203 | + mv -f miniperl miniperl-target |
| 204 | + ln -s hostperl miniperl |
| 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' |
| 206 | \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" |
| 207 | !GROK!THIS! |
| 208 | else |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 209 | @@ -986,7 +994,9 @@ lib/buildcustomize.pl: $& $(miniperl_obj |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 210 | -@rm -f miniperl.xok |
| 211 | $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 212 | $(miniperl_objs) $(libs) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 213 | - $(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' |
| 214 | + mv -f miniperl miniperl-target |
| 215 | + ln -s hostperl miniperl |
| 216 | + #$(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' |
| 217 | $(MINIPERL) -f write_buildcustomize.pl |
| 218 | !NO!SUBS! |
| 219 | fi |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 220 | @@ -1036,7 +1046,7 @@ case "${osname}" in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 221 | catamount) |
| 222 | $spitshell >>$Makefile <<!GROK!THIS! |
| 223 | .PHONY: makeppport |
| 224 | -makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) |
| 225 | +makeppport: \$(CONFIGPM) |
| 226 | -@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \ |
| 227 | (cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \ |
| 228 | done |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 229 | @@ -1046,7 +1056,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 230 | *) |
| 231 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 232 | .PHONY: makeppport |
| 233 | -makeppport: $(MINIPERL_EXE) $(CONFIGPM) $(nonxs_ext) |
| 234 | +makeppport: $(CONFIGPM) $(nonxs_ext) |
| 235 | $(MINIPERL) mkppport |
| 236 | |
| 237 | !NO!SUBS! |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 238 | @@ -1056,16 +1066,16 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 239 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 240 | |
| 241 | .PHONY: preplibrary |
| 242 | -preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL) |
| 243 | +preplibrary: $(CONFIGPM) $(PREPLIBRARY_LIBPERL) |
| 244 | |
| 245 | $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD) |
| 246 | |
| 247 | -$(CONFIGPOD): config.sh $(MINIPERL_EXE) configpm Porting/Glossary lib/Config_git.pl |
| 248 | +$(CONFIGPOD): config.sh configpm Porting/Glossary lib/Config_git.pl |
| 249 | $(MINIPERL) configpm |
| 250 | |
| 251 | unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data |
| 252 | |
| 253 | -uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) |
| 254 | +uni.data: $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) |
| 255 | $(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p |
| 256 | # Commented out so always runs, mktables looks at far more files than we |
| 257 | # can in this makefile to decide if needs to run or not |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 258 | @@ -1074,12 +1084,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 259 | # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 |
| 260 | # But also this ensures that all extensions are built before we try to scan |
| 261 | # them, which picks up Devel::PPPort's documentation. |
| 262 | -pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc |
| 263 | - $(RUN_PERL) -f pod/buildtoc -q |
| 264 | +pod/perltoc.pod: $(perltoc_pod_prereqs) $(ext) pod/buildtoc |
| 265 | + $(MINIPERL) -f pod/buildtoc -q |
| 266 | |
| 267 | pod/perlapi.pod: pod/perlintern.pod |
| 268 | |
| 269 | -pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc |
| 270 | +pod/perlintern.pod: autodoc.pl embed.fnc |
| 271 | $(MINIPERL) autodoc.pl |
| 272 | |
| 273 | pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 274 | @@ -1089,7 +1099,7 @@ pod/perl5244delta.pod: pod/perldelta.pod |
| 275 | $(RMS) pod/perl5244delta.pod |
| 276 | $(LNS) perldelta.pod pod/perl5244delta.pod |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 277 | |
| 278 | -extra.pods: $(MINIPERL_EXE) |
| 279 | +extra.pods: |
| 280 | -@test ! -f extra.pods || rm -f `cat extra.pods` |
| 281 | -@rm -f extra.pods |
| 282 | -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 283 | @@ -1133,8 +1143,7 @@ EOT |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 284 | $spitshell >>$Makefile <<EOT |
| 285 | |
| 286 | install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman |
| 287 | - \$(RUN_PERL) installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS) |
| 288 | - \$(RUN_PERL) installman --destdir=\$(DESTDIR) $flags |
| 289 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS) |
| 290 | EOT |
| 291 | fi |
| 292 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 293 | @@ -1144,11 +1153,7 @@ done |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 294 | if test "X$hostperl" != X; then |
| 295 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 296 | install.perl: $(INSTALL_DEPENDENCE) installperl |
| 297 | - $(HOST_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) |
| 298 | - -@test ! -s extras.lst || $(MAKE) extras.install |
| 299 | - |
| 300 | -install.man: all installman |
| 301 | - $(HOST_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) |
| 302 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) |
| 303 | |
| 304 | # XXX Experimental. Hardwired values, but useful for testing. |
| 305 | # Eventually Configure could ask for some of these values. |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 306 | @@ -1166,24 +1171,8 @@ install.html: all installhtml |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 307 | else |
| 308 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 309 | install.perl: $(INSTALL_DEPENDENCE) installperl |
| 310 | - $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) |
| 311 | - -@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 312 | - |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 313 | -install.man: all installman |
| 314 | - $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 315 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) |
| 316 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 317 | -# XXX Experimental. Hardwired values, but useful for testing. |
| 318 | -# Eventually Configure could ask for some of these values. |
| 319 | -install.html: all installhtml |
| 320 | - -@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd .. |
| 321 | - $(RUN_PERL) installhtml \ |
| 322 | - --podroot=. --podpath=. --recurse \ |
| 323 | - --htmldir=$(privlib)/html \ |
| 324 | - --htmlroot=$(privlib)/html \ |
| 325 | - --splithead=pod/perlipc \ |
| 326 | - --splititem=pod/perlfunc \ |
| 327 | - --ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \ |
| 328 | - --verbose |
| 329 | !NO!SUBS! |
| 330 | fi |
| 331 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 332 | @@ -1275,13 +1264,13 @@ manicheck: FORCE |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 333 | # |
| 334 | # DynaLoader may be needed for extensions that use Makefile.PL. |
| 335 | |
| 336 | -$(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) |
| 337 | +$(DYNALOADER): lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) |
| 338 | $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) |
| 339 | |
| 340 | -d_dummy $(dynamic_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL) |
| 341 | +d_dummy $(dynamic_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL) |
| 342 | $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic |
| 343 | |
| 344 | -s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE |
| 345 | +s_dummy $(static_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE |
| 346 | $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) |
| 347 | |
| 348 | n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 349 | @@ -1479,14 +1468,14 @@ test_prep_pre: preplibrary utilities $(n |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 350 | |
| 351 | case "$targethost" in |
| 352 | '') $spitshell >>$Makefile <<'!NO!SUBS!' |
| 353 | -test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \ |
| 354 | +test_prep test-prep: test_prep_pre $(unidatafiles) $(PERL_EXE) \ |
| 355 | $(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods) |
| 356 | cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) |
| 357 | |
| 358 | !NO!SUBS! |
| 359 | ;; |
| 360 | *) $spitshell >>$Makefile <<!GROK!THIS! |
| 361 | -test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE) \ |
| 362 | +test_prep test-prep: test_prep_pre \$(unidatafiles) \$(PERL_EXE) \ |
| 363 | \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \ |
| 364 | \$(generated_pods) |
| 365 | $to libperl.* |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 366 | @@ -1539,7 +1528,7 @@ test_prep test-prep: test_prep_pre \$(MI |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 367 | esac |
| 368 | |
| 369 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 370 | -test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) |
| 371 | +test_prep_reonly: $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) |
| 372 | $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic |
| 373 | cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) |
| 374 | !NO!SUBS! |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 375 | @@ -1600,7 +1589,7 @@ minitest_prep: |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 376 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 377 | MINITEST_TESTS = base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t |
| 378 | |
| 379 | -minitest: $(MINIPERL_EXE) minitest_prep |
| 380 | +minitest: minitest_prep |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 381 | - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 382 | |
| 383 | minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep |