X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=7759a28a51c12213dd606845b4d723b68ac822a9;hb=0fcc65bb90871a92ca233207ff84015dfc78f2a6;hp=2759114ddb05183839f9e3739085bd5487660a21;hpb=75550b4e442842ecb6730cd1ec1d17d1900bcbeb;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index 2759114..7759a28 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -36,6 +36,7 @@ true) esac pldlflags="$cccdlflags" + static_target='static_pic' case "${osname}${osvers}" in next4*) ld=libtool @@ -97,6 +98,7 @@ true) esac ;; *) pldlflags='' + static_target='static' ;; esac @@ -188,6 +190,13 @@ LIBPERL = $libperl LLIBPERL= $linklibperl SHRPENV = $shrpenv +# Static targets are ordinarily built without CCCDLFLAGS. However, +# if building a shared libperl.so that might later be linked into +# another application, then it might be appropriate to also build static +# extensions (usually just DynaLoader) with relocatable code (e.g. -fPIC +# for GNU cc). This is handled by ext/util/make_ext. +STATIC = $static_target + # The following is used to include the current directory in # the dynamic loader path you are building a shared libperl. LDLIBPTH = $ldlibpth @@ -320,12 +329,12 @@ lintflags = -hbvxac .c.s: $(CCCMDSRC) -S $*.c -.PHONY: all compile translators utilities - all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make @echo " "; @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." +.PHONY: all compile translators utilities + compile: all echo "testing compilation" > testcompile; cd utils; $(MAKE) compile; @@ -369,9 +378,19 @@ perlmain.c: miniperlmain.c config.sh $(FIRSTMAKEFILE) sh writemain $(DYNALOADER) $(static_ext) > writemain.tmp sh mv-if-diff writemain.tmp perlmain.c +!NO!SUBS! +case "$osname" in +cygwin) + ;; # Let cygwin/Makefile.SHs do its work. +*) + $spitshell >>Makefile <<'!NO!SUBS!' perlmain$(OBJ_EXT): perlmain.c $(CCCMD) $(PLDLFLAGS) $*.c +!NO!SUBS! + ;; +esac +$spitshell >>Makefile <<'!NO!SUBS!' # The file ext.libs is a list of libraries that must be linked in # for static extensions, e.g. -lm -lgdbm, etc. The individual # static extension Makefile's add to it. @@ -556,7 +575,7 @@ perl.third.config: config.sh @grep "^usemymalloc='n'" config.sh >/dev/null || exit 1 perl.third: /usr/bin/atom perl.third.config perl - atom -tool third -L. -all -gp -toolargs="-pthread -fork -quiet -invalid -uninit heap+stack+partword+copy -min 0" perl + atom -tool third -L. -all -gp -toolargs="-invalid -uninit heap+stack+copy -min 0" perl @echo "Now you may run perl.third and then study perl.3log." # Pixie Perls (Tru64 and IRIX only) @@ -657,7 +676,7 @@ preplibrary: miniperl$(EXE_EXT) lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL) # 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$(EXE_EXT) configpm +lib/Config.pm: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary $(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp sh mv-if-diff configpm.tmp $@ @@ -701,7 +720,7 @@ extras.install: perl$(EXE_EXT) -@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` .PHONY: install install-strip install-all install-verbose install-silent \ - no-install install.perl install.man installman install.html installhtml + no-install install.perl install.man install.html install-strip: $(MAKE) STRIPFLAGS=-s install @@ -843,13 +862,13 @@ regen_all: $(PERLYVMS) regen_headers regen_pods # DynaLoader may be needed for extensions that use Makefile.PL. $(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE - @$(LDLIBPTH) sh ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) @@ -878,6 +897,7 @@ veryclean: _verycleaner _mopup _clobber # Do not 'make _mopup' directly. _mopup: rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c + -rmdir .depending -@test -f extra.pods && rm -f `cat extra.pods` -@test -f vms/README_vms.pod && rm -f vms/README_vms.pod -rm -f perl.exp ext.libs extra.pods opmini.o @@ -887,7 +907,8 @@ _mopup: -rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs -rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok -rm -f perlld cygwin.c ld2 libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump - rm -f perl$(EXE_EXT) suidperl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* microperl + -rm -f perl$(EXE_EXT) suidperl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* microperl + -rm -f opcode.h-old opnames.h-old pp.sym-old pp_proto.h-old # Do not 'make _tidy' directly. _tidy: @@ -926,7 +947,7 @@ _cleaner2: rm -rf lib/Encode -rmdir lib/IO/Socket lib/IO/t lib/IO -rmdir lib/Filter/Util lib/List lib/MIME lib/PerlIO lib/Scalar lib/Sys - -rmdir lib/Thread lib/XS + -rmdir lib/Thread lib/XS lib/threads/shared lib/threads t/lib/B _realcleaner: @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean @@ -971,7 +992,7 @@ makedepend: makedepend.SH config.sh .PHONY: test check test_prep test_prep_nodll test_prep_pre _test_prep \ test_tty test-tty _test_tty test_notty test-notty _test_notty \ - utest ucheck test.utf8 check.utf8 \ + utest ucheck test.utf8 check.utf8 test.torture torturetest \ test.third check.third utest.third ucheck.third test_notty.third \ test.deparse test_notty.deparse \ minitest coretest @@ -1028,6 +1049,11 @@ test-tty: test_tty test-notty: test_notty +# Torture testing + +test.torture torturetest: test_prep + PERL=./perl TEST_ARGS=-torture $(MAKE) _test + # Targets for Third Degree testing. test_prep.third: test_prep perl.third