Remove the pack.t kludge introduced to fudge the test

[p5sagit/p5-mst-13.2.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 64f89fd..724fb63 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -33,7 +33,7 @@ INST_TOP      *= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER       *= \5.5.650
+INST_VER       *= \5.5.670
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -99,9 +99,9 @@ INST_ARCH     *= \$(ARCHNAME)
 # Visual C++ >= 6.x
 #CCTYPE                *= MSVC60
 # Borland 5.02 or later
-CCTYPE         *= BORLAND
-# mingw32/gcc-2.95.2 or better
-#CCTYPE                *= GCC
+#CCTYPE                *= BORLAND
+# mingw32+gcc-2.95.2 or better
+CCTYPE         *= GCC
 
 #
 # uncomment this if you are compiling under Windows 95/98 and command.com
@@ -165,9 +165,9 @@ CCTYPE              *= BORLAND
 # so you may have to set CCHOME explicitly (spaces in the path name should
 # not be quoted)
 #
-CCHOME         *= c:\bc5
+#CCHOME                *= c:\bc5
 #CCHOME                *= $(MSVCDIR)
-#CCHOME                *= D:\packages\mingw32
+CCHOME         *= c:\gcc-2.95.2-msvcrt
 CCINCDIR       *= $(CCHOME)\include
 CCLIBDIR       *= $(CCHOME)\lib
 
@@ -288,8 +288,8 @@ ARCHNAME    = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)
 .ENDIF
 
-.IF "$(USE_OBJECT)" == "define"
-ARCHNAME       = $(ARCHNAME)-thread
+.IF "$(USE_ITHREADS)" == "define"
+ARCHNAME       !:= $(ARCHNAME)-thread
 .ENDIF
 
 # Visual Studio 98 specific
@@ -297,7 +297,7 @@ ARCHNAME    = $(ARCHNAME)-thread
 
 # VC 6.0 can load the socket dll on demand.  Makes the test suite
 # run in about 10% less time.
-DELAYLOAD      *= -DELAYLOAD:wsock32.dll delayimp.lib 
+DELAYLOAD      *= -DELAYLOAD:wsock32.dll -DELAYLOAD:shell32.dll delayimp.lib 
 
 # VC 6.0 seems capable of compiling perl correctly with optimizations
 # enabled.  Anything earlier fails tests.
@@ -409,6 +409,9 @@ OBJOUT_FLAG = -o
 EXEOUT_FLAG    = -o
 LIBOUT_FLAG    = 
 
+# NOTE: we assume that GCC uses MSVCRT.DLL
+BUILDOPT       += -fno-strict-aliasing -DPERL_MSVCRT_READFIX
+
 .ELSE
 
 CC             = cl
@@ -576,6 +579,7 @@ UTILS               =                       \
                ..\pod\podselect        \
                ..\x2p\find2perl        \
                ..\x2p\s2p              \
+               bin\exetype.pl          \
                bin\runperl.pl          \
                bin\pl2bat.pl           \
                bin\perlglob.pl         \
@@ -590,11 +594,7 @@ CFGH_TMPL  = config_H.bc
 
 CFGSH_TMPL     = config.gc
 CFGH_TMPL      = config_H.gc
-.IF "$(USE_OBJECT)" == "define"
-PERLIMPLIB     = ..\libperlcore$(a)
-.ELSE
-PERLIMPLIB     = ..\libperl$(a)
-.ENDIF
+PERLIMPLIB     = ..\libperl56$(a)
 
 .ELSE
 
@@ -658,11 +658,8 @@ EXTRACORE_SRC      += ..\perlio.c
 
 WIN32_SRC      =               \
                .\win32.c       \
-               .\win32sck.c
-
-.IF "$(USE_5005THREADS)" == "define"
-WIN32_SRC      += .\win32thread.c 
-.ENDIF
+               .\win32sck.c    \
+               .\win32thread.c 
 
 .IF "$(CRYPT_SRC)" != ""
 WIN32_SRC      += .\$(CRYPT_SRC)
@@ -741,7 +738,8 @@ SETARGV_OBJ = setargv$(o)
 .ENDIF
 
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
-               Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob
+               Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
+               Sys/Hostname
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -762,6 +760,7 @@ PEEK                = $(EXTDIR)\Devel\Peek\Peek
 BYTELOADER     = $(EXTDIR)\ByteLoader\ByteLoader
 DPROF          = $(EXTDIR)\Devel\DProf\DProf
 GLOB           = $(EXTDIR)\File\Glob\Glob
+HOSTNAME       = $(EXTDIR)\Sys\Hostname\Hostname
 
 SOCKET_DLL     = $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL      = $(AUTODIR)\Fcntl\Fcntl.dll
@@ -778,6 +777,7 @@ RE_DLL              = $(AUTODIR)\re\re.dll
 BYTELOADER_DLL = $(AUTODIR)\ByteLoader\ByteLoader.dll
 DPROF_DLL      = $(AUTODIR)\Devel\DProf\DProf.dll
 GLOB_DLL       = $(AUTODIR)\File\Glob\Glob.dll
+HOSTNAME_DLL   = $(AUTODIR)\Sys\Hostname\Hostname.dll
 
 ERRNO_PM       = $(LIBDIR)\Errno.pm
 
@@ -796,7 +796,8 @@ EXTENSION_C =               \
                $(B).c          \
                $(BYTELOADER).c \
                $(DPROF).c      \
-               $(GLOB).c
+               $(GLOB).c       \
+               $(HOSTNAME).c
 
 EXTENSION_DLL  =               \
                $(SOCKET_DLL)   \
@@ -813,7 +814,8 @@ EXTENSION_DLL       =               \
                $(THREAD_DLL)   \
                $(BYTELOADER_DLL)       \
                $(DPROF_DLL)    \
-               $(GLOB_DLL)
+               $(GLOB_DLL)     \
+               $(HOSTNAME_DLL)
 
 EXTENSION_PM   =               \
                $(ERRNO_PM)
@@ -1040,7 +1042,7 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES)
                perl.exp $(LKPOST))
 .ELSE
        $(LINK32) -dll -def:perldll.def -out:$@ \
-           @$(mktmp $(BLINK_FLAGS) $(LIBFILES) $(PERLDLL_RES) $(PERLDLL_OBJ:s,\,\\))
+           @$(mktmp $(BLINK_FLAGS) $(LIBFILES) /base:0x28000000 $(PERLDLL_RES) $(PERLDLL_OBJ:s,\,\\))
 .ENDIF
        $(XCOPY) $(PERLIMPLIB) $(COREDIR)
 
@@ -1182,6 +1184,11 @@ $(SOCKET_DLL): $(PERLEXE) $(SOCKET).xs
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
        cd $(EXTDIR)\$(*B) && $(MAKE)
 
+$(HOSTNAME_DLL): $(PERLEXE) $(HOSTNAME).xs
+       cd $(EXTDIR)\Sys\$(*B) && \
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       cd $(EXTDIR)\Sys\$(*B) && $(MAKE)
+
 $(BYTELOADER_DLL): $(PERLEXE) $(BYTELOADER).xs
        cd $(EXTDIR)\$(*B) && \
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl