Re: [PATCH] Cray XT4/Catamount build

Message-ID: <46F063E0.1000004@iki.fi>

(Restores a pre-generated utils/Makefile for the benefit of Win32,
which can't run utils/Makefile.SH itself)

p4raw-id: //depot/perl@31899

diff --git a/MANIFEST b/MANIFEST
index 40d7911..e5cb5c5 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -3935,6 +3935,7 @@ utils/instmodsh.PL                Give information about installed extensions
 utils/libnetcfg.PL             libnet
 utils.lst                      Lists utilities bundled with Perl
 utils/Makefile.SH              Extract the utility scripts
+utils/Makefile                 Pregenerated from utils/Makefile.SH
 utils/perlbug.PL               A simple tool to submit a bug report
 utils/perldoc.PL               A simple tool to find & display perl's documentation
 utils/perlivp.PL               installation verification procedure

diff --git a/Porting/makerel b/Porting/makerel
index bb56375..9310ebe 100644 (file)
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -135,6 +135,7 @@ my @writables = qw(
     win32/config_H.bc
     win32/config_H.gc
     win32/config_H.vc
+    utils/Makefile
 );
 system("chmod +w @writables") == 0
     or die "system: $!";

diff --git a/utils/Makefile b/utils/Makefile
new file mode 100644 (file)
index 0000000..4d56bea
--- /dev/null
+++ b/utils/Makefile
@@ -0,0 +1,78 @@
+
+PERL = ../miniperl
+REALPERL = ../perl
+RUN =   # Used mainly cross-compilation setups.
+
+
+# Files to be built with variable substitution after miniperl is
+# available.  Dependencies handled manually below (for now).
+
+pl = c2ph.PL config_data.PL corelist.PL cpan.PL h2ph.PL h2xs.PL instmodsh.PL perlbug.PL perldoc.PL perlivp.PL pl2pm.PL prove.PL ptar.PL ptardiff.PL cpanp-run-perl.PL cpanp.PL cpan2dist.PL shasum.PL splain.PL dprofpp.PL libnetcfg.PL piconv.PL enc2xs.PL xsubpp.PL
+plextract = c2ph config_data corelist cpan h2ph h2xs instmodsh perlbug perldoc perlivp pl2pm prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum splain dprofpp libnetcfg piconv enc2xs xsubpp
+plextractexe = ./c2ph ./config_data ./corelist ./cpan ./h2ph ./h2xs ./instmodsh ./perlbug ./perldoc ./perlivp ./pl2pm ./prove ./ptar ./ptardiff ./cpanp-run-perl ./cpanp ./cpan2dist ./shasum ./splain ./dprofpp ./libnetcfg ./piconv ./enc2xs ./xsubpp
+
+all: $(plextract) 
+
+$(plextract):
+       $(RUN) $(PERL) -I../lib $@.PL
+
+c2ph:          c2ph.PL ../config.sh
+
+cpan:          cpan.PL ../config.sh
+
+config_data:   config_data.PL ../config.sh
+
+corelist:      corelist.PL ../config.sh
+
+h2ph:          h2ph.PL ../config.sh
+
+h2xs:          h2xs.PL ../config.sh
+
+instmodsh:     instmodsh.PL ../config.sh
+
+perlbug:       perlbug.PL ../config.sh ../patchlevel.h
+
+perldoc:       perldoc.PL ../config.sh
+
+perlivp:       perlivp.PL ../config.sh
+
+prove:         prove.PL ../config.sh
+
+ptar:          ptar.PL ../config.sh
+
+ptardiff:      ptardiff.PL ../config.sh
+
+cpanp-run-perl:        cpanp-run-perl.PL ../config.sh
+
+cpanp: cpanp.PL ../config.sh
+
+cpan2dist:     cpan2dist.PL ../config.sh
+
+pl2pm:         pl2pm.PL ../config.sh
+
+shasum:                shasum.PL ../config.sh
+
+splain:                splain.PL ../config.sh ../lib/diagnostics.pm
+
+dprofpp:       dprofpp.PL ../config.sh
+
+libnetcfg:     libnetcfg.PL ../config.sh
+
+piconv:                piconv.PL ../config.sh
+
+enc2xs:                enc2xs.PL ../config.sh
+
+xsubpp:                xsubpp.PL ../config.sh
+
+clean:
+
+realclean:
+       rm -rf $(plextract) pstruct $(plextractexe)
+       rm -f ../t/_h2ph_pre.ph
+
+clobber:       realclean
+
+distclean:     clobber
+
+veryclean:     distclean
+       -rm -f *~ *.org

diff --git a/utils/Makefile.SH b/utils/Makefile.SH
index 42a274c..b5a2f12 100644 (file)
--- a/utils/Makefile.SH
+++ b/utils/Makefile.SH
@@ -30,7 +30,7 @@ cat >Makefile <<!GROK!THIS!
 
 PERL = ../miniperl
 REALPERL = ../perl
-RUN = $run
+RUN = $run  # Used mainly cross-compilation setups.
 
 !GROK!THIS!