X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=c9cbfe60f2f97dede9be5485b2654f48479b01e4;hb=d521382bf0c8e54f9edce0c05df5bb707c9a49cb;hp=0fb637215095a4bb09d32d5f657d512efef747c5;hpb=91baf504a93ab1a7458aa43ef8f95c80faae4196;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index 0fb6372..c9cbfe6 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -230,6 +230,21 @@ INSTALLPREFIXEXP = $prefix # $installusrbinperl # $versiononly +case "${osname}:${osvers}" in +darwin:*) +$spitshell >>Makefile <>Makefile <<'!NO!SUBS!' @@ -238,7 +253,7 @@ CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $@` CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $<` -private = preplibrary lib/ExtUtils/Miniperl.pm lib/Config.pm +private = preplibrary lib/Config.pm lib/ExtUtils/Miniperl.pm # Files to be built with variable substitution before miniperl # is available. @@ -266,19 +281,19 @@ h1 = EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h dosish.h h2 = embed.h form.h gv.h handy.h hv.h keywords.h mg.h op.h h3 = opcode.h patchlevel.h perl.h perlapi.h perly.h pp.h proto.h regcomp.h h4 = regexp.h scope.h sv.h unixish.h util.h iperlsys.h thread.h -h5 = utf8.h warnings.h +h5 = utf8.h warnings.h sharedsv.h h = $(h1) $(h2) $(h3) $(h4) $(h5) c1 = $(mallocsrc) av.c scope.c op.c doop.c doio.c dump.c hv.c mg.c c2 = perl.c perly.c pp.c pp_hot.c pp_ctl.c pp_sys.c regcomp.c regexec.c utf8.c c3 = gv.c sv.c taint.c toke.c util.c deb.c run.c universal.c xsutils.c -c4 = globals.c perlio.c perlapi.c numeric.c locale.c pp_pack.c +c4 = globals.c perlio.c perlapi.c numeric.c locale.c pp_pack.c sharedsv.c c = $(c1) $(c2) $(c3) $(c4) miniperlmain.c perlmain.c obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) op$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(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) xsutils$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) +obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) xsutils$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) sharedsv$(OBJ_EXT) obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) @@ -627,26 +642,27 @@ sperl$(OBJ_EXT): perl.c $(h) # test -d lib/auto || mkdir lib/auto # .PHONY: preplibrary -preplibrary: miniperl lib/Config.pm lib/lib.pm lib/re.pm +preplibrary: miniperl lib/Config.pm lib/lib.pm @sh ./makedir lib/auto @echo " AutoSplitting perl library" $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.pm + $(MAKE) lib/re.pm # Take care to avoid modifying lib/Config.pm without reason # (If trying to create a new port and having problems with the configpm script, # try 'make minitest' and/or commenting out the tests at the end of configpm.) -lib/Config.pm: config.sh miniperl configpm lib/re.pm +lib/Config.pm: config.sh miniperl configpm $(LDLIBPTH) ./miniperl configpm configpm.tmp sh mv-if-diff configpm.tmp $@ lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl minimod.pl lib/Config.pm $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp sh mv-if-diff minimod.tmp $@ + -touch lib/ExtUtils/Miniperl.pm lib/re.pm: ext/re/re.pm - @-rm -f $@ - cat ext/re/re.pm > $@ + cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm $(plextract): miniperl lib/Config.pm @-rm -f $@ @@ -772,7 +788,7 @@ CHMOD_W = chmod +w # keywords.pl: keywords.h # opcode.pl: opcode.h opnames.h pp_proto.h pp.sym # [* embed.pl needs pp.sym generated by opcode.pl! *] -# embed.pl: proto.h embed.h embedvar.h global.sym objXSUB.h +# embed.pl: proto.h embed.h embedvar.h global.sym # perlapi.h perlapi.c pod/perlintern.pod # pod/perlapi.pod # bytecode.pl: ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c @@ -787,7 +803,7 @@ CHMOD_W = chmod +w AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym proto.h \ embed.h embedvar.h global.sym \ pod/perlintern.pod pod/perlapi.pod \ - objXSUB.h perlapi.h perlapi.c ext/ByteLoader/byterun.h \ + perlapi.h perlapi.c ext/ByteLoader/byterun.h \ ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm regnodes.h \ warnings.h lib/warnings.pm @@ -821,13 +837,9 @@ $(DYNALOADER): miniperl preplibrary FORCE @$(LDLIBPTH) sh ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) d_dummy $(dynamic_ext): miniperl preplibrary $(DYNALOADER) FORCE - @-rm -f lib/re.pm - @cat ext/re/re.pm > lib/re.pm @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) s_dummy $(static_ext): miniperl preplibrary $(DYNALOADER) FORCE - @-rm -f lib/re.pm - @cat ext/re/re.pm > lib/re.pm @$(LDLIBPTH) sh ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) n_dummy $(nonxs_ext): miniperl preplibrary $(DYNALOADER) FORCE @@ -944,7 +956,7 @@ makedepend: makedepend.SH config.sh utest ucheck test.utf8 check.utf8 \ test.third check.third utest.third ucheck.third test_notty.third \ test.deparse test_notty.deparse \ - minitest + minitest coretest # Cannot delegate rebuilding of t/perl to make # to allow interlaced test and minitest @@ -989,6 +1001,9 @@ test_notty: test_prep utest ucheck test.utf8 check.utf8: test_prep PERL=./perl TEST_ARGS=-utf8 $(MAKE) _test +coretest: test_prep + PERL=./perl TEST_ARGS=-core $(MAKE) _test + test-prep: test_prep test-tty: test_tty