- updated for 3.11

Changed files:
    crossmingw32-runtime-configure.patch -> 1.3
    crossmingw32-runtime-stdinc.patch -> 1.3

diff --git a/crossmingw32-runtime-configure.patch b/crossmingw32-runtime-configure.patch
index 27dfd90518dd35318944a2846149cd2259b821c6..b5e0cdd8cae84625d45a970c1a6300daec213520 100644 (file)
--- a/crossmingw32-runtime-configure.patch
+++ b/crossmingw32-runtime-configure.patch
@@ -61,17 +61,8 @@
  CC=${CC-cc}
  AC_SUBST(CC)
  AS=${AS-as}
---- mingw-runtime-3.0/configure.in.wiget       2003-05-06 15:23:18.000000000 +0000
-+++ mingw-runtime-3.0/configure.in     2003-07-04 13:46:49.000000000 +0000
-@@ -19,8 +19,6 @@
- AC_PREREQ(2.59)
- AC_INIT(dllmain.c)
- 
--LIB_AC_PROG_CC
--
- case "$with_cross_host" in
-   ""|*cygwin*) all_dlls_host='all_dlls_host'
-              install_dlls_host='install_dlls_host';;
+--- mingw-runtime-3.11/configure.in.wiget      2003-05-06 15:23:18.000000000 +0000
++++ mingw-runtime-3.11/configure.in    2003-07-04 13:46:49.000000000 +0000
 @@ -28,6 +26,8 @@
  AC_SUBST(all_dlls_host)
  AC_SUBST(install_dlls_host)
@@ -81,16 +72,3 @@
  AC_CHECK_TOOL(AR, ar, ar)
  
  AC_SUBST(AR)
-@@ -43,10 +43,10 @@
- AC_SUBST(DLLWRAP)
- AC_CHECK_TOOL(WINDRES, windres, windres)
- AC_SUBST(WINDRES)
-+AC_CANONICAL_SYSTEM
-+AC_SUBST(CFLAGS)
- 
--AC_ALLOCA
- 
--AC_CANONICAL_SYSTEM
- AC_CONFIG_SUBDIRS(profile mingwex)
- HEADER_SUBDIR=""
- 

diff --git a/crossmingw32-runtime-stdinc.patch b/crossmingw32-runtime-stdinc.patch
index b949cd02491236fd2d911a3b1e8a879d189c63bf..0ffe8a7cf06d267f4885aeacb4633fbcaa3e73cf 100644 (file)
--- a/crossmingw32-runtime-stdinc.patch
+++ b/crossmingw32-runtime-stdinc.patch
@@ -9,17 +9,16 @@ diff -urN mingw-runtime-3.5.orig/Makefile.in mingw-runtime-3.5/Makefile.in
    -iwithprefixbefore include
  ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
  ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN)
-diff -urN mingw-runtime-3.5.orig/mingwex/Makefile.in mingw-runtime-3.5/mingwex/Makefile.in
---- mingw-runtime-3.5.orig/mingwex/Makefile.in 2004-09-05 16:20:28.000000000 +0200
-+++ mingw-runtime-3.5/mingwex/Makefile.in      2004-09-11 22:31:02.780888432 +0200
-@@ -85,7 +85,6 @@
+--- mingw-runtime-3.11/mingwex/Makefile.in.orig        2007-02-19 22:27:01.698642398 +0100
++++ mingw-runtime-3.11/mingwex/Makefile.in     2007-02-19 22:28:17.074937847 +0100
+@@ -105,7 +105,6 @@
  
  W32API_INCLUDE = @W32API_INCLUDE@
- INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
+ INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../include \
 -  -nostdinc \
    -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
- ALL_CXXFLAGS = $(CXXFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN)
+ ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
+ ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN)
 diff -urN mingw-runtime-3.5.orig/profile/Makefile.in mingw-runtime-3.5/profile/Makefile.in
 --- mingw-runtime-3.5.orig/profile/Makefile.in 2004-09-05 15:37:02.000000000 +0200
 +++ mingw-runtime-3.5/profile/Makefile.in      2004-09-11 22:31:27.078194680 +0200