From 9dd4b2806e0d9cc1533550c174613a69fc8f96b3 Mon Sep 17 00:00:00 2001
From: Tony Cook <tony@develop-help.com>
Date: Wed, 17 Feb 2016 15:41:41 +1100
Subject: let the definition of PERLDEP see the definition of PERLIMPLIB

PERLIMPLIB wasn't being built, resulting in build failures of
XS modules after perl was installed.

Since installperl installs from the base of the source tree rather
than from lib/CORE, copy $(PERLIMPLIB) to the base of the tree.
---
 win32/GNUmakefile | 14 +++++++-------
 win32/makefile.mk | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index 92d4528..2cdaef9 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -815,13 +815,6 @@ PERLEXE_ICO	= .\perlexe.ico
 PERLEXE_RES	= .\perlexe.res
 PERLDLL_RES	=
 
-# Nominate a target which causes extensions to be re-built
-# This used to be $(PERLEXE), but at worst it is the .dll that they depend
-# on and really only the interface - i.e. the .def file used to export symbols
-# from the .dll
-PERLDEP = $(PERLIMPLIB)
-
-
 PL2BAT		= bin\pl2bat.pl
 
 UTILS		=			\
@@ -881,6 +874,12 @@ PERLEXPLIB	?= $(COREDIR)\perl523.exp
 PERLSTATICLIB	?= ..\perl523s$(a)
 PERLDLL		= ..\perl523.dll
 
+# Nominate a target which causes extensions to be re-built
+# This used to be $(PERLEXE), but at worst it is the .dll that they depend
+# on and really only the interface - i.e. the .def file used to export symbols
+# from the .dll
+PERLDEP = $(PERLIMPLIB)
+
 # don't let "gmake -n all" try to run "miniperl.exe make_ext.pl"
 PLMAKE		= gmake
 
@@ -1373,6 +1372,7 @@ ifeq ($(CCTYPE),GCC)
 else
 	lib -def:perldll.def -machine:$(ARCHITECTURE) /OUT:$(PERLIMPLIB)
 endif
+	$(XCOPY) $(PERLIMPLIB) ..
 
 $(PERLDLL): $(PERLEXPLIB) $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
 ifeq ($(CCTYPE),GCC)
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 2403aa7..2b8f02a 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -801,13 +801,6 @@ PERLEXE_ICO	= .\perlexe.ico
 PERLEXE_RES	= .\perlexe.res
 PERLDLL_RES	=
 
-# Nominate a target which causes extensions to be re-built
-# This used to be $(PERLEXE), but at worst it is the .dll that they depend
-# on and really only the interface - i.e. the .def file used to export symbols
-# from the .dll
-PERLDEP = $(PERLIMPLIB)
-
-
 PL2BAT		= bin\pl2bat.pl
 
 UTILS		=			\
@@ -865,6 +858,12 @@ PERLEXPLIB	*= $(COREDIR)\perl523.exp
 PERLSTATICLIB	*= ..\perl523s$(a)
 PERLDLL		= ..\perl523.dll
 
+# Nominate a target which causes extensions to be re-built
+# This used to be $(PERLEXE), but at worst it is the .dll that they depend
+# on and really only the interface - i.e. the .def file used to export symbols
+# from the .dll
+PERLDEP = $(PERLIMPLIB)
+
 #EUMM on Win32 isn't ready for parallel make, so only allow this file to be parallel
 #$(MAKE) will contain the -P that this makefile was called with, which is bad for
 #make_ext.pl since upto jobs*jobs processes will run instead of jobs
@@ -1345,6 +1344,7 @@ $(PERLEXPLIB) $(PERLIMPLIB) .UPDATEALL : perldll.def
 .ELSE #VC family
 	lib -def:perldll.def -machine:$(ARCHITECTURE) /OUT:$(PERLIMPLIB)
 .ENDIF
+	$(XCOPY) $(PERLIMPLIB) ..
 
 $(PERLDLL): $(PERLEXPLIB) $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
 .IF "$(CCTYPE)" == "GCC"
-- 
2.7.0.windows.1

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 2403aa7..e9b19d7 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -27,7 +27,7 @@
 # newly built perl.
 #
 INST_DRV	*= c:
-INST_TOP	*= $(INST_DRV)\perl
+INST_TOP	*= $(INST_DRV)\p523
 
 #
 # Uncomment if you want to build a 32-bit Perl using a 32-bit compiler
@@ -1436,6 +1436,8 @@ Extensions_normalize : $(PERLDEP) $(DYNALOADER) $(GLOBEXE) $(UNIDATAFILES)
 Extensions_reonly : $(PERLDEP) $(DYNALOADER)
 	$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(PLMAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --dynamic +re
 
+makepd: $(PERLDEP)
+
 Extensions_static : ..\make_ext.pl list_static_libs.pl $(CONFIGPM) $(GLOBEXE) $(HAVE_COREDIR)
 	$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(PLMAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --static
 	$(MINIPERL) -I..\lib list_static_libs.pl > Extensions_static
------------------------------------------------------------------

From f730e5664c3fbe9fdfbd94925e333e3b29f812a5 Mon Sep 17 00:00:00 2001
From: Daniel Dragan <bulk88@hotmail.com>
Date: Wed, 17 Feb 2016 15:35:11 -0500
Subject: [PATCH] [perl #127556] update installperl to new location of W32
 libperl link lib

commit bf543eaf90 made the Win32 GCC or VC linkers produce
[lib]perl[5xx].[a/lib] in the /lib/CORE dir to reduce the prereq recipie
lines needing to run until XS modules can be built ("Extensions" which
builds all DLL XS modules is the longest running target and every effort
should be made for it to be started sooner by the make tool in parallel
build). The file is now made in /lib/CORE, previously it was made in root
and xcopy-ed to /lib/CORE in the same target that built the file. xcopy is
a seperate process run so was remove in that commit.

installperl doesn't use uninstalled /lib/CORE to determine the contents of
installed /lib/CORE (maybe that is a bug or bad design?), so the linking
lib was not being installed after a "[g/d]make install" making it
impossible to compile XS code on Win32 Perl. Change installperl
to look for the linking lib in /lib/CORE on Win32 and not in root. Even
though the nmake makefile still does the XCOPY since it is older/less
maintained, the installperl code still works since the root and /lib/CORE
files are identical on the nmake build and built in the same target.
---
 installperl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/installperl b/installperl
index 5ea37be..f4d850b 100755
--- a/installperl
+++ b/installperl
@@ -373,6 +373,8 @@ elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy
     ( copy("$installbin/$libperl", $coredll) &&
       push(@corefiles, $instcoredll)
     )
+} elsif ($Is_W32) {
+    @corefiles = <*.h>;
 } else {
     # [als] hard-coded 'libperl' name... not good!
     @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
@@ -393,6 +395,13 @@ foreach my $file (@corefiles) {
     }
 }
 
+if ($Is_W32) { #linking lib isn't made in root but in CORE on Win32
+    @corefiles = <lib/CORE/libperl*.* lib/CORE/perl*$Config{lib_ext}>;
+    my $dest;
+    copy_if_diff($_,($dest = $installarchlib.substr($_,3))) &&
+	chmod($NON_SO_MODE, $dest) foreach @corefiles;
+}
+
 # Install main perl executables
 # Make links to ordinary names if installbin directory isn't current directory.
 
-- 
1.9.5.msysgit.1