develooper Front page | perl.perl5.changes | Postings from November 2010

[perl.git] branch blead, updated. v5.13.7-166-g3eaf695

From:
Nicholas Clark
Date:
November 28, 2010 07:55
Subject:
[perl.git] branch blead, updated. v5.13.7-166-g3eaf695
Message ID:
E1PMjam-00005R-WF@camel.ams6.corp.booking.com
In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/3eaf69502c5993865935106db7a5beaf16b1819d?hp=014530329eda6c695780760ec2c4307a3c39c523>

- Log -----------------------------------------------------------------
commit 3eaf69502c5993865935106db7a5beaf16b1819d
Author: Nicholas Clark <nick@ccl4.org>
Date:   Sun Nov 28 15:52:58 2010 +0000

    Proper Makefile dependencies for the x2p/s2p rule.
    
    Without this, a parallel make for a static build can fail, as x2p/Makefile
    uses ../perl for a static build, but there was no rule to ensure that ../perl
    was built.
    
    A static build currently still fails some tests, I think because Encode doesn't
    link all encodings staticly.
-----------------------------------------------------------------------

Summary of changes:
 Makefile.SH |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.SH b/Makefile.SH
index f468062..557f4f8 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -581,6 +581,9 @@ $spitshell >>$Makefile <<!GROK!THIS!
 translators:	$x2p_deps
 	@echo " "; echo "	Making x2p stuff"; cd x2p; \$(LDLIBPTH) \$(MAKE) all
 
+x2p/s2p: $x2p_deps
+	cd x2p; \$(LDLIBPTH) \$(MAKE) s2p
+
 utilities:	$util_deps
 	@echo " "; echo "	Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all
 
@@ -1005,9 +1008,6 @@ lib/re.pm: ext/re/re.pm
 	@-rm -f $@
 	cp ext/re/re.pm lib/re.pm
 
-x2p/s2p: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL
-	cd x2p; $(LDLIBPTH) $(MAKE) s2p
-
 unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data
 
 uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)

--
Perl5 Master Repository



nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About