CWS-TOOLING: integrate CWS mingwport33

7 files changed, 32 insertions, 8 deletions

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index 751af3ca687c..b27d483e9e60 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -135,7 +135,7 @@ db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR)
 db_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
 CFLAGS+=-D_GLIBCXX_DLL
-db_LIBS+=-lstdc++_s
+db_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS)
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index a5ddbc6af935..ceeb18547305 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -78,7 +78,7 @@ cairo_CC=$(CC) -mthreads
 cairo_CC+=-shared-libgcc
 .ENDIF
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-cairo_LIBS+=-lstdc++_s
+cairo_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 
 CONFIGURE_DIR=
diff --git a/curl/makefile.mk b/curl/makefile.mk
index f4e4c7f8ffd1..cb6ac50dc705 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -91,7 +91,7 @@ curl_CC+=-shared-libgcc
 .ENDIF
 curl_LIBS=-lws2_32 -lwinmm
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-curl_LIBS+=-lstdc++_s
+curl_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 CONFIGURE_DIR=.$/
 #relative to CONFIGURE_DIR
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 7542aeb1ccd1..b4a9d7dd3bbf 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -149,9 +149,9 @@ icu_LDFLAGS+=-shared-libgcc
 icu_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api
 .ENDIF
 icu_LDFLAGS+=-L$(COMPATH)$/lib
-icu_LIBS=-lmingwthrd
+icu_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-icu_LIBS+=-lstdc++_s
+icu_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2
 CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
@@ -253,6 +253,30 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary
 
 .ENDIF
 
+.IF "$(GUI)$(COM)"=="WNTGCC"
+ALLTAR : \
+    $(LB)$/icudata.lib \
+    $(LB)$/icuin$(ICU_BUILD_LIBPOST).lib \
+    $(LB)$/icuuc$(ICU_BUILD_LIBPOST).lib \
+    $(LB)$/icule$(ICU_BUILD_LIBPOST).lib \
+    $(LB)$/icutu$(ICU_BUILD_LIBPOST).lib
+
+$(LB)$/icudata.lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $@
+
+$(LB)$/icuin$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $@
+
+$(LB)$/icuuc$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $@
+
+$(LB)$/icule$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $@
+
+$(LB)$/icutu$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+    $(TOUCH) $@
+.ENDIF
+
 # Since you never know what will be in a patch (for example, it may already
 # patch at configure level) or in the case of a binary patch, we remove the
 # entire package directory if a patch is newer.
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index b172b9b89b8f..20a22e46fe0f 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -65,7 +65,7 @@ xml2_CC+=-shared-libgcc
 .ENDIF
 xml2_LIBS=-lws2_32
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-xml2_LIBS+=-lstdc++_s
+xml2_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index c4bb5f50977b..d17b2c455f25 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -67,7 +67,7 @@ xslt_CC+=-shared-libgcc
 .ENDIF
 xslt_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-xslt_LIBS+=-lstdc++_s
+xslt_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 34e278c4d84c..c2f0bf5984ca 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -113,7 +113,7 @@ nss_CXX+=-shared-libgcc
 
 nss_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-nss_LIBS+=-lstdc++_s
+nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF