Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status:Inappropriate [embedded specific] |
| 2 | |
| 3 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 4 | --- |
| 5 | Makefile.SH | 145 +++++++++++++++++++++++++++-------------------------------- |
| 6 | 1 file changed, 67 insertions(+), 78 deletions(-) |
| 7 | |
| 8 | diff --git a/Makefile.SH b/Makefile.SH |
| 9 | index 034d812..67e08fd 100755 |
| 10 | --- a/Makefile.SH |
| 11 | +++ b/Makefile.SH |
| 12 | @@ -39,10 +39,10 @@ case "$useshrplib" in |
| 13 | true) |
| 14 | # Prefix all runs of 'miniperl' and 'perl' with |
| 15 | # $ldlibpth so that ./perl finds *this* shared libperl. |
| 16 | - case "$LD_LIBRARY_PATH" in |
| 17 | - '') ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;; |
| 18 | - *) ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;; |
| 19 | - esac |
| 20 | + #case "$LD_LIBRARY_PATH" in |
| 21 | + #'') ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `" ;; |
| 22 | + #*) ldlibpth="LD_LIBRARY_PATH=` quote "$pwd" `:` quote "$LD_LIBRARY_PATH" `" ;; |
| 23 | + #esac |
| 24 | |
| 25 | pldlflags="$cccdlflags" |
| 26 | static_ldflags='' |
| 27 | @@ -122,10 +122,11 @@ true) |
| 28 | *) |
| 29 | eval "ldlibpthval=\"\$$ldlibpthname\"" |
| 30 | |
| 31 | - case "$ldlibpthval" in |
| 32 | - '') ldlibpth="$ldlibpthname=` quote "$pwd" `" ;; |
| 33 | - *) ldlibpth="$ldlibpthname=` quote "$pwd" `:` quote "$ldlibpthval" `" ;; |
| 34 | - esac |
| 35 | +# We compile in the library path in OE from cross-compile, so lets not do this |
| 36 | +# case "$ldlibpthval" in |
| 37 | +# '') ldlibpth="$ldlibpthname=` quote "$pwd" `" ;; |
| 38 | +# *) ldlibpth="$ldlibpthname=` quote "$pwd" `:` quote "$ldlibpthval" `" ;; |
| 39 | +# esac |
| 40 | |
| 41 | ;; |
| 42 | esac |
| 43 | @@ -141,18 +142,7 @@ true) |
| 44 | # INSTALL file, under "Building a shared perl library". |
| 45 | # If there is no pre-existing $libperl, we don't need |
| 46 | # to do anything further. |
| 47 | - if test -f $archlib/CORE/$libperl; then |
| 48 | - rm -f preload |
| 49 | - cat <<'EOT' > preload |
| 50 | -#! /bin/sh |
| 51 | -lib=$1 |
| 52 | -shift |
| 53 | -test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" |
| 54 | -exec "$@" |
| 55 | -EOT |
| 56 | - chmod 755 preload |
| 57 | - ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" |
| 58 | - fi |
| 59 | + echo linux libraries overwritten by cross-compile patches |
| 60 | ;; |
| 61 | os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" |
| 62 | ;; |
| 63 | @@ -566,13 +556,23 @@ splintfiles = $(c1) |
| 64 | @echo `$(CCCMDSRC)` -S $*.c |
| 65 | @`$(CCCMDSRC)` -S $*.c |
| 66 | |
| 67 | -all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) |
| 68 | - @echo " "; |
| 69 | - @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." |
| 70 | +#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) |
| 71 | +# @echo " "; |
| 72 | +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." |
| 73 | + |
| 74 | +all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) miniperl $(unidatafiles) |
| 75 | + |
| 76 | +more: $(generated_pods) $(private) $(public) |
| 77 | + |
| 78 | +more2: $(dynamic_ext) |
| 79 | |
| 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 | + |
| 85 | +more4: extras.make $(MANIFEST_SRT) |
| 86 | + |
| 87 | +$(MANIFEST_SRT): MANIFEST |
| 88 | + @$(MINIPERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \ |
| 89 | + $(MINIPERL) Porting/manisort -q -o MANIFEST; sh -c true) |
| 90 | @touch $(MANIFEST_SRT) |
| 91 | |
| 92 | .PHONY: all utilities |
| 93 | @@ -581,7 +581,7 @@ $(MANIFEST_SRT): MANIFEST $(PERL_EXE) |
| 94 | # by make_patchnum.pl. |
| 95 | git_version.h: lib/Config_git.pl |
| 96 | |
| 97 | -lib/Config_git.pl: $(MINIPERL_EXE) make_patchnum.pl |
| 98 | +lib/Config_git.pl: make_patchnum.pl |
| 99 | $(MINIPERL) make_patchnum.pl |
| 100 | |
| 101 | # make sure that we recompile perl.c if the git version changes |
| 102 | @@ -594,7 +594,7 @@ perl$(OBJ_EXT): git_version.h |
| 103 | # loading, we need to build perl first. |
| 104 | case "$usedl$static_cwd" in |
| 105 | defineundef) |
| 106 | - util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE' |
| 107 | + util_deps='$(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE' |
| 108 | ;; |
| 109 | definedefine) |
| 110 | util_deps='$(PERL_EXE) $(CONFIGPM) FORCE' |
| 111 | @@ -604,7 +604,7 @@ definedefine) |
| 112 | esac |
| 113 | |
| 114 | $spitshell >>$Makefile <<!GROK!THIS! |
| 115 | -utils/Makefile: \$(MINIPERL_EXE) \$(CONFIGPM) utils/Makefile.PL |
| 116 | +utils/Makefile: \$(CONFIGPM) utils/Makefile.PL |
| 117 | \$(MINIPERL) -Ilib utils/Makefile.PL |
| 118 | |
| 119 | utilities: utils/Makefile $util_deps |
| 120 | @@ -699,7 +699,7 @@ esac |
| 121 | |
| 122 | |
| 123 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 124 | -perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib |
| 125 | +perlmain.c: ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm |
| 126 | $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext) |
| 127 | |
| 128 | # The file ext.libs is a list of libraries that must be linked in |
| 129 | @@ -760,7 +760,7 @@ PERLEXPORT = perl.exp |
| 130 | ;; |
| 131 | esac |
| 132 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 133 | -perl.exp: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) |
| 134 | +perl.exp: makedef.pl $(CONFIGPM) $(SYM) $(SYMH) |
| 135 | ./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp |
| 136 | |
| 137 | !NO!SUBS! |
| 138 | @@ -769,7 +769,7 @@ os2) |
| 139 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 140 | MINIPERLEXP = miniperl |
| 141 | |
| 142 | -perl5.def: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map |
| 143 | +perl5.def: makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map |
| 144 | ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def |
| 145 | |
| 146 | !NO!SUBS! |
| 147 | @@ -829,7 +829,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT) |
| 148 | true) |
| 149 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 150 | rm -f $@ |
| 151 | - $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) |
| 152 | + $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5 |
| 153 | !NO!SUBS! |
| 154 | case "$osname" in |
| 155 | aix) |
| 156 | @@ -877,7 +877,9 @@ $(MINIPERL_EXE): lib/buildcustomize.pl |
| 157 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 158 | lib/buildcustomize.pl: $& $(mini_obj) |
| 159 | $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(mini_obj) $(libs) |
| 160 | - $(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' |
| 161 | + mv -f miniperl miniperl-target |
| 162 | + ln -s hostperl miniperl |
| 163 | + #$(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' |
| 164 | $(MINIPERL) -f write_buildcustomize.pl |
| 165 | !NO!SUBS! |
| 166 | ;; |
| 167 | @@ -885,7 +887,9 @@ lib/buildcustomize.pl: $& $(mini_obj) |
| 168 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 169 | lib/buildcustomize.pl: $& $(mini_obj) write ldcustomize.pl |
| 170 | $(CC) -o $(MINIPERL_EXE) $(mini_obj libs) |
| 171 | - $(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' |
| 172 | + mv -f miniperl miniperl-target |
| 173 | + ln -s hostperl miniperl |
| 174 | + #$(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' |
| 175 | $(MINIPERL) -f write_buildcustomize.pl |
| 176 | !NO!SUBS! |
| 177 | ;; |
| 178 | @@ -907,7 +911,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl |
| 179 | -@rm -f miniperl.xok |
| 180 | $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ |
| 181 | $(mini_obj) $(libs) |
| 182 | - $(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' |
| 183 | + mv -f miniperl miniperl-target |
| 184 | + ln -s hostperl miniperl |
| 185 | + #$(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' |
| 186 | $(MINIPERL) -f write_buildcustomize.pl |
| 187 | !NO!SUBS! |
| 188 | ;; |
| 189 | @@ -918,7 +924,9 @@ lib/buildcustomize.pl: \$& \$(mini_obj) write_buildcustomize.pl |
| 190 | -@rm -f miniperl.xok |
| 191 | -@rm \$(MINIPERL_EXE) |
| 192 | \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE) |
| 193 | - \$(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' |
| 194 | + mv -f miniperl miniperl-target |
| 195 | + ln -s hostperl miniperl |
| 196 | + #\$(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' |
| 197 | \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" |
| 198 | !GROK!THIS! |
| 199 | else |
| 200 | @@ -927,7 +935,9 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl |
| 201 | -@rm -f miniperl.xok |
| 202 | $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ |
| 203 | $(mini_obj) $(libs) |
| 204 | - $(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' |
| 205 | + mv -f miniperl miniperl-target |
| 206 | + ln -s hostperl miniperl |
| 207 | + #$(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' |
| 208 | $(MINIPERL) -f write_buildcustomize.pl |
| 209 | !NO!SUBS! |
| 210 | fi |
| 211 | @@ -971,7 +981,7 @@ case "${osname}" in |
| 212 | catamount) |
| 213 | $spitshell >>$Makefile <<!GROK!THIS! |
| 214 | .PHONY: makeppport |
| 215 | -makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) |
| 216 | +makeppport: \$(CONFIGPM) |
| 217 | -@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 | done |
| 220 | @@ -981,7 +991,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM) |
| 221 | *) |
| 222 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 223 | .PHONY: makeppport |
| 224 | -makeppport: $(MINIPERL_EXE) $(CONFIGPM) $(nonxs_ext) |
| 225 | +makeppport: $(CONFIGPM) $(nonxs_ext) |
| 226 | $(MINIPERL) mkppport |
| 227 | |
| 228 | !NO!SUBS! |
| 229 | @@ -991,16 +1001,16 @@ esac |
| 230 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 231 | |
| 232 | .PHONY: preplibrary |
| 233 | -preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL) |
| 234 | +preplibrary: $(CONFIGPM) $(PREPLIBRARY_LIBPERL) |
| 235 | |
| 236 | $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD) |
| 237 | |
| 238 | -$(CONFIGPOD): config.sh $(MINIPERL_EXE) configpm Porting/Glossary lib/Config_git.pl |
| 239 | +$(CONFIGPOD): config.sh configpm Porting/Glossary lib/Config_git.pl |
| 240 | $(MINIPERL) configpm |
| 241 | |
| 242 | unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data |
| 243 | |
| 244 | -uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) |
| 245 | +uni.data: $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) |
| 246 | $(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 | # 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 | # $(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 | # them, which picks up Devel::PPPort's documentation. |
| 253 | -pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc |
| 254 | - $(RUN_PERL) -f pod/buildtoc -q |
| 255 | +pod/perltoc.pod: $(perltoc_pod_prereqs) $(ext) pod/buildtoc |
| 256 | + $(MINIPERL) -f pod/buildtoc -q |
| 257 | |
| 258 | pod/perlapi.pod: pod/perlintern.pod |
| 259 | |
| 260 | -pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc |
| 261 | +pod/perlintern.pod: autodoc.pl embed.fnc |
| 262 | $(MINIPERL) autodoc.pl |
| 263 | |
| 264 | pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST |
| 265 | @@ -1024,7 +1034,7 @@ pod/perl5220delta.pod: pod/perldelta.pod |
| 266 | $(RMS) pod/perl5220delta.pod |
| 267 | $(LNS) perldelta.pod pod/perl5220delta.pod |
| 268 | |
| 269 | -extra.pods: $(MINIPERL_EXE) |
| 270 | +extra.pods: |
| 271 | -@test ! -f extra.pods || rm -f `cat extra.pods` |
| 272 | -@rm -f extra.pods |
| 273 | -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ |
| 274 | @@ -1068,8 +1078,7 @@ EOT |
| 275 | $spitshell >>$Makefile <<EOT |
| 276 | |
| 277 | install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman |
| 278 | - \$(RUN_PERL) installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS) |
| 279 | - \$(RUN_PERL) installman --destdir=\$(DESTDIR) $flags |
| 280 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS) |
| 281 | EOT |
| 282 | fi |
| 283 | |
| 284 | @@ -1079,11 +1088,7 @@ done |
| 285 | if test "X$hostperl" != X; then |
| 286 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 287 | install.perl: $(INSTALL_DEPENDENCE) installperl |
| 288 | - $(HOST_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) |
| 289 | - -@test ! -s extras.lst || $(MAKE) extras.install |
| 290 | - |
| 291 | -install.man: all installman |
| 292 | - $(HOST_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) |
| 293 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) |
| 294 | |
| 295 | # XXX Experimental. Hardwired values, but useful for testing. |
| 296 | # Eventually Configure could ask for some of these values. |
| 297 | @@ -1101,24 +1106,8 @@ install.html: all installhtml |
| 298 | else |
| 299 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 300 | install.perl: $(INSTALL_DEPENDENCE) installperl |
| 301 | - $(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 | + ./hostperl -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) |
| 304 | |
| 305 | -install.man: all installman |
| 306 | - $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) |
| 307 | - |
| 308 | -# XXX Experimental. Hardwired values, but useful for testing. |
| 309 | -# Eventually Configure could ask for some of these values. |
| 310 | -install.html: all installhtml |
| 311 | - -@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd .. |
| 312 | - $(RUN_PERL) installhtml \ |
| 313 | - --podroot=. --podpath=. --recurse \ |
| 314 | - --htmldir=$(privlib)/html \ |
| 315 | - --htmlroot=$(privlib)/html \ |
| 316 | - --splithead=pod/perlipc \ |
| 317 | - --splititem=pod/perlfunc \ |
| 318 | - --ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \ |
| 319 | - --verbose |
| 320 | !NO!SUBS! |
| 321 | fi |
| 322 | |
| 323 | @@ -1210,13 +1199,13 @@ manicheck: FORCE |
| 324 | # |
| 325 | # DynaLoader may be needed for extensions that use Makefile.PL. |
| 326 | |
| 327 | -$(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) |
| 328 | +$(DYNALOADER): lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) |
| 329 | $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) |
| 330 | |
| 331 | -d_dummy $(dynamic_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL) |
| 332 | +d_dummy $(dynamic_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL) |
| 333 | $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic |
| 334 | |
| 335 | -s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE |
| 336 | +s_dummy $(static_ext): lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE |
| 337 | $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) |
| 338 | |
| 339 | n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE |
| 340 | @@ -1405,14 +1394,14 @@ test_prep_pre: preplibrary utilities $(nonxs_ext) |
| 341 | |
| 342 | case "$targethost" in |
| 343 | '') $spitshell >>$Makefile <<'!NO!SUBS!' |
| 344 | -test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \ |
| 345 | +test_prep test-prep: test_prep_pre $(unidatafiles) $(PERL_EXE) \ |
| 346 | $(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods) |
| 347 | cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) |
| 348 | |
| 349 | !NO!SUBS! |
| 350 | ;; |
| 351 | *) $spitshell >>$Makefile <<!GROK!THIS! |
| 352 | -test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE) \ |
| 353 | +test_prep test-prep: test_prep_pre \$(unidatafiles) \$(PERL_EXE) \ |
| 354 | \$(dynamic_ext) \$(TEST_PERL_DLL) runtests \ |
| 355 | \$(generated_pods) |
| 356 | $to libperl.* |
| 357 | @@ -1465,7 +1454,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE |
| 358 | esac |
| 359 | |
| 360 | $spitshell >>$Makefile <<'!NO!SUBS!' |
| 361 | -test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) |
| 362 | +test_prep_reonly: $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) |
| 363 | $(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 | !NO!SUBS! |
| 366 | @@ -1516,7 +1505,7 @@ $spitshell >>$Makefile <<'!NO!SUBS!' |
| 367 | |
| 368 | # Can't depend on lib/Config.pm because that might be where miniperl |
| 369 | # is crashing. |
| 370 | -minitest: $(MINIPERL_EXE) |
| 371 | +minitest: |
| 372 | -@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles) |
| 373 | @echo " " |
| 374 | @echo "You may see some irrelevant test failures if you have been unable" |