X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/cbeaa189514a121fd71c6b4fb40c0bee7598a3d3..476b2fe140faa8717a42570d490ab58ffd66a0a3:/Makefile.SH diff --git a/Makefile.SH b/Makefile.SH index 86e6d46..6b824f5 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -20,20 +20,6 @@ case $CROSS_NAME in ;; esac -# H.Merijn Brand [17 Feb 2004] -# This comment is just to ensure that Configure will find variables that -# are removed/replaced in patches on blead, but are still needed in the -# 5.8.x, 5.6.x and 5.005.x maintainance tracks. -# metaconfig -m will scan all .SH files on this level (not deeper), and -# not in x2p and other subfolders. This file is as good as any .SH -# patch references -# #22227 $baserev -# #22302 $yacc $byacc - -# H.Merijn Brand [30 Oct 2004] -# Mentioned for the same reason for future reference -# #23434 $d_strlcat $d_strlcpy - : This forces SH files to create target in same directory as SH file. : This is so that make depend always knows where to find SH derivatives. case "$0" in @@ -178,6 +164,16 @@ EOT ;; esac +: is Cwd static or dynamic +static_cwd='define' +list_util_dep='$(PERL_EXE)' +for f in $dynamic_ext; do + case $f in + Cwd) static_cwd='undef' ;; + List/Util) list_util_dep=lib/auto/List/Util/Util.$dlext + esac +done + : Prepare dependency lists for Makefile. dynamic_list=' ' dynamic_ext_re="lib/auto/re/re.$dlext" @@ -190,16 +186,10 @@ for f in $dynamic_ext; do : Parallel makes reveal that we have some interdependencies case $f in - Encode) extra_dep="$extra_dep -$this_target: lib/auto/Cwd/Cwd.$dlext" ;; Math/BigInt/FastCalc|Devel/NYTProf) extra_dep="$extra_dep -$this_target: lib/auto/List/Util/Util.$dlext" ;; +$this_target: $list_util_dep" ;; Unicode/Normalize) extra_dep="$extra_dep $this_target: uni.data" ;; - Text/ParseWords) extra_dep="$extra_dep -$this_target: lib/auto/Scalar/Util.$dlext" ;; - SDBM_File) extra_dep="$extra_dep -$this_target: lib/auto/Cwd/Cwd.$dlext" ;; esac done @@ -229,11 +219,13 @@ done dtrace_h='' dtrace_o='' +minidtrace_o='' case "$usedtrace" in define|true) dtrace_h='perldtrace.h' $dtrace -G -s perldtrace.d -o perldtrace.tmp >/dev/null 2>&1 \ - && rm -f perldtrace.tmp && dtrace_o='perldtrace$(OBJ_EXT)' + && rm -f perldtrace.tmp && dtrace_o='perldtrace$(OBJ_EXT)' \ + && minidtrace_o='miniperldtrace$(OBJ_EXT)' ;; esac @@ -346,6 +338,7 @@ VALGRIND=valgrind DTRACE = $dtrace DTRACE_H = $dtrace_h DTRACE_O = $dtrace_o +MINIDTRACE_O = $minidtrace_o FIRSTMAKEFILE = $firstmakefile @@ -430,7 +423,7 @@ esac ## In the following dollars and backticks do not need the extra backslash. $spitshell >>$Makefile <<'!NO!SUBS!' -private = preplibrary $(CONFIGPM) $(CONFIGPOD) lib/ExtUtils/Miniperl.pm git_version.h +private = preplibrary $(CONFIGPM) $(CONFIGPOD) lib/ExtUtils/Miniperl.pm git_version.h lib/buildcustomize.pl # Files to be built with variable substitution before miniperl # is available. @@ -457,23 +450,26 @@ h = $(h1) $(h2) $(h3) $(h4) $(h5) c1 = av.c scope.c op.c doop.c doio.c dump.c gv.c hv.c mg.c reentr.c mro.c perl.c c2 = perly.c pp.c pp_hot.c pp_ctl.c pp_sys.c regcomp.c regexec.c utf8.c sv.c -c3 = taint.c toke.c util.c deb.c run.c universal.c pad.c globals.c +c3 = taint.c toke.c util.c deb.c run.c universal.c pad.c globals.c keywords.c c4 = perlio.c perlapi.c numeric.c mathoms.c locale.c pp_pack.c pp_sort.c c5 = $(madlysrc) $(mallocsrc) -c = $(c1) $(c2) $(c3) $(c4) $(c5) miniperlmain.c perlmain.c opmini.c perlmini.c +c = $(c1) $(c2) $(c3) $(c4) $(c5) miniperlmain.c opmini.c perlmini.c obj0 = op$(OBJ_EXT) perl$(OBJ_EXT) -obj1 = $(madlyobj) $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) pad$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) reentr$(OBJ_EXT) mro$(OBJ_EXT) +obj0mini = perlmini$(OBJ_EXT) opmini$(OBJ_EXT) miniperlmain$(OBJ_EXT) +obj1 = $(madlyobj) $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) pad$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) reentr$(OBJ_EXT) mro$(OBJ_EXT) keywords$(OBJ_EXT) obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT) obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) mathoms$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) pp_sort$(OBJ_EXT) -mini_obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) $(DTRACE_O) +minindt_obj = $(obj0mini) $(obj1) $(obj2) $(obj3) $(ARCHOBJS) +mini_obj = $(minindt_obj) $(MINIDTRACE_O) ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS) obj = $(ndt_obj) $(DTRACE_O) -perltoc_pod_prereqs = extra.pods pod/perl5138delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod +perltoc_pod_prereqs = extra.pods pod/perl5153delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs) +generated_headers = uudmap.h bitcount.h mg_data.h Icwd = -Idist/Cwd -Idist/Cwd/lib @@ -565,11 +561,15 @@ perl$(OBJ_EXT): git_version.h # Making utilities and translators require Cwd. If we have dynamic # loading, we only need miniperl and Cwd.$dlext. If we have static # loading, we need to build perl first. -case "$usedl" in -define) +case "$usedl$static_cwd" in +defineundef) util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE' x2p_deps='$(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE' ;; +definedefine) + util_deps='$(PERL_EXE) $(CONFIGPM) FORCE' + x2p_deps='$(PERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE' + ;; *) util_deps='$(PERL_EXE) $(CONFIGPM) FORCE' x2p_deps='$(PERL_EXE) $(CONFIGPM) FORCE' ;; @@ -582,6 +582,9 @@ translators: $x2p_deps x2p/s2p: $x2p_deps cd x2p; \$(LDLIBPTH) \$(MAKE) s2p +x2p/find2perl: $x2p_deps + cd x2p; \$(LDLIBPTH) \$(MAKE) find2perl + utilities: $util_deps @echo " "; echo " Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all @@ -629,12 +632,14 @@ done $spitshell >>$Makefile <<'!NO!SUBS!' -globals$(OBJ_EXT): uudmap.h bitcount.h +globals$(OBJ_EXT): $(generated_headers) -uudmap.h: bitcount.h +uudmap.h mg_data.h: bitcount.h bitcount.h: generate_uudmap$(HOST_EXE_EXT) - $(RUN) ./generate_uudmap$(HOST_EXE_EXT) uudmap.h bitcount.h + $(RUN) ./generate_uudmap$(HOST_EXE_EXT) $(generated_headers) + +generate_uudmap$(OBJ_EXT): mg_raw.h generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT) $(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs) @@ -745,8 +750,11 @@ else case "$dtrace_h" in ?*) $spitshell >>$Makefile <<'!NO!SUBS!' +# dtrace dicards const qualifiers from arguments, put them back $(DTRACE_H): perldtrace.d - $(DTRACE) -h -s perldtrace.d -o $(DTRACE_H) + $(DTRACE) -h -s perldtrace.d -o $(DTRACE_H).in + sed -e '/const/!s/char \*/const char */g' $(DTRACE_H).in >$(DTRACE_H) + $(RMS) $(DTRACE_H).in mydtrace.h: $(DTRACE_H) @@ -756,9 +764,12 @@ mydtrace.h: $(DTRACE_H) case "$dtrace_o" in ?*) $spitshell >>$Makefile <<'!NO!SUBS!' -$(DTRACE_O): perldtrace.d +$(DTRACE_O): perldtrace.d $(ndt_obj) $(DTRACE) -G -s perldtrace.d -o $(DTRACE_O) $(ndt_obj) +$(MINIDTRACE_O): perldtrace.d $(minindt_obj) perlmini$(OBJ_EXT) + $(DTRACE) -G -s perldtrace.d -o $(MINIDTRACE_O) $(minindt_obj) perlmini$(OBJ_EXT) + !NO!SUBS! ;; esac @@ -806,18 +817,15 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT) case "${osname}${osvers}" in aix*|beos*) $spitshell >>$Makefile <<'!NO!SUBS!' -$(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) - $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) \ - $(mini_obj) \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs) +$(MINIPERL_EXE): $& $(mini_obj) + $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(mini_obj) $(libs) $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest !NO!SUBS! ;; next4*) $spitshell >>$Makefile <<'!NO!SUBS!' -$(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) perlmini$(OBJ_EXT) opmini$(OBJ_EXT) - $(CC) -o $(MINIPERL_EXE) $(mini_obj) \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs) +$(MINIPERL_EXE): $& $(mini_obj) + $(CC) -o $(MINIPERL_EXE) $(mini_obj) $(libs) $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest !NO!SUBS! ;; @@ -835,21 +843,19 @@ NAMESPACEFLAGS = -force_flat_namespace ;; esac $spitshell >>$Makefile <<'!NO!SUBS!' -$(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) +$(MINIPERL_EXE): $& $(mini_obj) -@rm -f miniperl.xok $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ - $(mini_obj) \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs) + $(mini_obj) $(libs) $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest !NO!SUBS! ;; *) $spitshell >>$Makefile <<'!NO!SUBS!' -$(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) +$(MINIPERL_EXE): $& $(mini_obj) -@rm -f miniperl.xok $(LDLIBPTH) $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ - $(mini_obj) \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs) + $(mini_obj) $(libs) $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '' || $(MAKE) minitest !NO!SUBS! ;; @@ -992,7 +998,7 @@ esac $spitshell >>$Makefile <<'!NO!SUBS!' .PHONY: preplibrary -preplibrary: $(MINIPERL_EXE) $(CONFIGPM) lib/re.pm $(PREPLIBRARY_LIBPERL) +preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL) $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD) @@ -1002,9 +1008,8 @@ $(CONFIGPOD): config.sh $(MINIPERL_EXE) configpm Porting/Glossary lib/Config_git lib/ExtUtils/Miniperl.pm: miniperlmain.c $(MINIPERL_EXE) minimod.pl $(CONFIGPM) $(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm -lib/re.pm: ext/re/re.pm - @-rm -f $@ - cp ext/re/re.pm lib/re.pm +lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl + $(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data @@ -1028,8 +1033,8 @@ pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST $(MINIPERL) $(Icwd) pod/perlmodlib.PL -q -pod/perl5138delta.pod: pod/perldelta.pod - $(LNS) perldelta.pod pod/perl5138delta.pod +pod/perl5153delta.pod: pod/perldelta.pod + $(LNS) perldelta.pod pod/perl5153delta.pod extra.pods: $(MINIPERL_EXE) -@test ! -f extra.pods || rm -f `cat extra.pods` @@ -1115,20 +1120,15 @@ perly.c: perly.y perly.h: perly.y -@sh -c true -# No compat3.sym here since and including the 5.004_50. -# No interp.sym since 5.005_03. -SYM = global.sym globvar.sym perlio.sym pp.sym +SYM = globvar.sym perlio.sym SYMH = perlvars.h intrpvar.h CHMOD_W = chmod +w # The following files are generated automatically -# embed.pl: proto.h embed.h embedvar.h global.sym -# perlapi.h perlapi.c -# [* embed.pl needs pp.sym generated by opcode.pl! *] -# keywords.pl: keywords.h -# opcode.pl: opcode.h opnames.h pp.sym +# embed.pl: proto.h embed.h embedvar.h perlapi.h perlapi.c +# opcode.pl: opcode.h opnames.h pp_proto.h # regcomp.pl: regnodes.h # warnings.pl: warnings.h lib/warnings.pm # The correct versions should be already supplied with the perl kit, @@ -1138,18 +1138,18 @@ CHMOD_W = chmod +w # with your existing copy of perl # (make regen_headers is kept for backwards compatibility) -AUTOGEN_FILES = keywords.h opcode.h opnames.h pp.sym proto.h \ - embed.h embedvar.h global.sym \ - perlapi.h perlapi.c regnodes.h \ - warnings.h lib/warnings.pm +AUTOGEN_FILES = opcode.h opnames.h pp_proto.h proto.h embed.h embedvar.h \ + perlapi.h perlapi.c regnodes.h warnings.h lib/warnings.pm .PHONY: regen_headers regen_all regen: FORCE -perl regen.pl + -perl regen/uconfig_h.pl regen_headers: FORCE -perl regen.pl -v + -perl regen/uconfig_h.pl -v regen_meta: META.yml @@ -1178,16 +1178,16 @@ manicheck: FORCE # # DynaLoader may be needed for extensions that use Makefile.PL. -$(DYNALOADER): $(MINIPERL_EXE) preplibrary FORCE $(nonxs_ext) +$(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) -d_dummy $(dynamic_ext): $(MINIPERL_EXE) preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) +d_dummy $(dynamic_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic -s_dummy $(static_ext): $(MINIPERL_EXE) preplibrary makeppport $(DYNALOADER) FORCE +s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) -n_dummy $(nonxs_ext): $(MINIPERL_EXE) preplibrary FORCE +n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) !NO!SUBS! @@ -1225,7 +1225,7 @@ veryclean: _verycleaner _mopup _clobber # Do not 'make _mopup' directly. _mopup: - rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c opmini.c perlmini.c uudmap.h generate_uudmap$(EXE_EXT) bitcount.h + rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c opmini.c perlmini.c generate_uudmap$(EXE_EXT) $(generated_headers) -rmdir .depending -@test -f extra.pods && rm -f `cat extra.pods` -@test -f vms/README_vms.pod && rm -f vms/README_vms.pod @@ -1237,7 +1237,6 @@ _mopup: -rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump -rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl - -rm -f opcode.h-old opnames.h-old pp.sym-old -rm -f config.arch config.over $(DTRACE_H) runtests # Do not 'make _tidy' directly. @@ -1272,7 +1271,8 @@ _cleaner1: _cleaner2: -rm -f core.*perl.*.? t/core.perl.*.? .?*.c rm -f core *perl.core t/core t/*perl.core core.* t/core.* - rm -f t/misctmp* t/forktmp* t/tmp* t/c t/$(PERL_EXE) t/rantests + rm -f t/$(PERL_EXE) t/rantests + rm -rf t/tmp* rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) rm -rf $(addedbyconf) rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old @@ -1282,7 +1282,7 @@ _cleaner2: rm -f lib/.exists lib/*/.exists lib/*/*/.exists rm -f h2ph.man pstruct rm -rf .config - rm -f preload lib/re.pm + rm -f preload rm -rf lib/Encode lib/Compress lib/Hash lib/re rm -rf lib/TAP lib/Module/Pluggable lib/App rm -rf lib/mro @@ -1296,7 +1296,7 @@ _cleaner2: -rmdir cpan/CPANPLUS-Dist-Build/t/dummy-cpanplus cpan/CPANPLUS/t/dummy-cpanplus cpan/CPANPLUS/t/dummy-localmirror -rmdir ext/B/lib -rmdir lib/Archive/Tar lib/Archive lib/Attribute - -rmdir lib/CGI + -rmdir lib/CGI lib/Carp -rmdir lib/Data lib/Devel lib/Digest -rmdir lib/ExtUtils/Command lib/ExtUtils/Constant lib/ExtUtils/Liblist lib/ExtUtils/MakeMaker -rmdir lib/File/Spec lib/Filter/Util lib/Filter @@ -1352,11 +1352,9 @@ $(FIRSTMAKEFILE): README $(MAKEDEPEND) config.h: config_h.SH config.sh $(SHELL) config_h.SH -# When done, touch perlmain.c so that it doesn't get remade each time. .PHONY: depend depend: makedepend sh ./makedepend MAKE=$(MAKE) - - test -s perlmain.c && touch perlmain.c cd x2p; $(MAKE) depend # Cannot postpone this until $firstmakefile is ready ;-) @@ -1385,7 +1383,9 @@ _test: test_prep_pre: preplibrary utilities $(nonxs_ext) -test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p +test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \ + $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \ + $(generated_pods) cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) @@ -1422,7 +1422,7 @@ test.torture torturetest: test_prep minitest.utf16: minitest.prep - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \ - && $(RUN_PERL) TEST -minitest -utf16 base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t