From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 8 Sep 2009 20:48:45 +0000 (+0100)
Subject: Can't build Dynamic extensions without DynaLoader.pm in place.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6afd19bc36bc53869c8b2366fb22deb141c4156e;hp=798fd3e29f1fe8240c74a40c471e3d19a421ea6b;p=p5sagit%2Fp5-mst-13.2.git

Can't build Dynamic extensions without DynaLoader.pm in place.

Add a dependency to ensure the order is correct.
---

diff --git a/win32/Makefile b/win32/Makefile
index 3279ce7..9b1a057 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1058,11 +1058,14 @@ MakePPPort_clean:
 	-if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\mkppport --clean
 
 #-------------------------------------------------------------------------------
-Extensions: ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
+# The rule for $(DYNALOADER).c makes DynaLoader.pm, and that is needed for
+# ExtUtils::Mkbootstrap. There's no direct way to mark a dependency on
+# DynaLoader.pm, so this will have to do
+Extensions: ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER).c
 	$(XCOPY) ..\*.h $(COREDIR)\*.*
 	$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynamic
 
-Extensions_reonly: ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
+Extensions_reonly: ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER).c
 	$(XCOPY) ..\*.h $(COREDIR)\*.*
 	$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynamic +re
 
diff --git a/win32/makefile.mk b/win32/makefile.mk
index fa23f07..ca5fc29 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1387,11 +1387,14 @@ MakePPPort_clean:
 	-if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\mkppport --clean
 
 #-------------------------------------------------------------------------------
-Extensions : ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
+# The rule for $(DYNALOADER).c makes DynaLoader.pm, and that is needed for
+# ExtUtils::Mkbootstrap. There's no direct way to mark a dependency on
+# DynaLoader.pm, so this will have to do
+Extensions : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER).c
 	$(XCOPY) ..\*.h $(COREDIR)\*.*
 	$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynamic
 
-Extensions_reonly : ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
+Extensions_reonly : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER).c
 	$(XCOPY) ..\*.h $(COREDIR)\*.*
 	$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynamic +re