Change 18046 by [EMAIL PROTECTED] on 2002/10/22 15:52:40
Subject: Re: Smoke 18027 FAIL(F) MSWin32 5.0 Win2000Pro (MSWin32-x86)
From: Alain Barbet <[EMAIL PROTECTED]>
Date: Fri, 18 Oct 2002 15:29:29 +0200
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/README.win32#67 edit
.... //depot/perl/win32/makefile.mk#238 edit
.... //depot/perl/win32/win32.c#210 edit
Differences ...
==== //depot/perl/README.win32#67 (text) ====
Index: perl/README.win32
--- perl/README.win32#66~17671~ Sat Aug 3 18:11:32 2002
+++ perl/README.win32 Tue Oct 22 08:52:40 2002
@@ -138,15 +138,26 @@
Perl. Make sure you are building within one of the "Build Environment"
shells available after you install the Platform SDK from the Start Menu.
-=item Mingw32 with GCC
+=item MinGW32 with gcc
-GCC-2.95.2 binaries can be downloaded from:
+The latest release of MinGW (at the time of writing) is 2.0.0, which comes
+with gcc-3.2, and can be downloaded here:
- ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/
+ http://sourceforge.net/projects/mingw
+
+Perl compiles with earlier releases of gcc (2.95 and up) that can be
+downloaded from the same place. If you use gcc-3.2, comment out the
+line:
+
+ USE_GCC_V3_2 *= define
+
+in win32\makefile.mk
You also need dmake. See L</"Make"> above on how to get it.
-The GCC-2.95.2 bundle comes with Mingw32 libraries and headers.
+=item MinGW release 1
+
+The MinGW-1.1 bundle comes with gcc-2.95.3.
Make sure you install the binaries that work with MSVCRT.DLL as indicated
in the README for the GCC bundle. You may need to set up a few environment
==== //depot/perl/win32/makefile.mk#238 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#237~18030~ Sat Oct 19 07:10:21 2002
+++ perl/win32/makefile.mk Tue Oct 22 08:52:40 2002
@@ -34,7 +34,7 @@
# versioned installation can be obtained by setting INST_TOP above to a
# path that includes an arbitrary version string.
#
-INST_VER *= \5.8.0
+INST_VER *= \5.9.0
#
# Comment this out if you DON'T want your perl installation to have
@@ -88,6 +88,9 @@
#CCTYPE *= BORLAND
# mingw32+gcc-2.95.2 or better
#CCTYPE *= GCC
+# Uncomment this if you are using the latest MinGW release (2.0.0)
+# with gcc3.2
+#USE_GCC_V3_2 *= define
#
# uncomment this if your Borland compiler is older than v5.4.
@@ -369,6 +372,9 @@
CC = gcc
LINK32 = gcc
+.IF "$(USE_GCC_V3_2)" == "define"
+LINK32 = g++
+.END
LIB32 = ar rc
IMPLIB = dlltool
RSC = rc
==== //depot/perl/win32/win32.c#210 (text) ====
Index: perl/win32/win32.c
--- perl/win32/win32.c#209~18030~ Sat Oct 19 07:10:21 2002
+++ perl/win32/win32.c Tue Oct 22 08:52:40 2002
@@ -15,7 +15,8 @@
#define Win32_Winsock
#endif
#include <windows.h>
-#ifndef __MINGW32__ /* GCC/Mingw32-2.95.2 forgot the WINAPI on
CommandLineToArgvW() */
+/* GCC-2.95.2/Mingw32-1.1 forgot the WINAPI on CommandLineToArgvW() */
+#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION==1)
# include <shellapi.h>
#else
LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCommandLine, int * pNumArgs);
@@ -60,8 +61,8 @@
int _CRT_glob = 0;
#endif
-#if defined(__MINGW32__)
-/* Mingw32 is missing some prototypes */
+#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION==1)
+/* Mingw32-1.1 is missing some prototypes */
FILE * _wfopen(LPCWSTR wszFileName, LPCWSTR wszMode);
FILE * _wfdopen(int nFd, LPCWSTR wszMode);
FILE * _freopen(LPCWSTR wszFileName, LPCWSTR wszMode, FILE * pOldStream);
End of Patch.
