Hi, Cygwin should not be using the MS C runtime. Patch removes msvcr* msvcp60 and crtdll import library from w32api mode.
Patch OK?
Index: Makefile.am
===================================================================
--- Makefile.am (revision 5982)
+++ Makefile.am (working copy)
@@ -344,11 +344,13 @@
lib32_libkernel32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
lib32_libkernel32_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include) $(AM_CPPFLAGS)
+if ! W32API
lib32_LIBRARIES += lib32/libmsvcrt.a
lib32_libmsvcrt_a_SOURCES = $(src_msvcrt32) lib32/msvcrt.def.in
lib32_libmsvcrt_a_AR = $(DTDEF32) lib32/msvcrt.def && $(AR) $(ARFLAGS)
lib32_libmsvcrt_a_CPPFLAGS=$(CPPFLAGS32) -D__LIBMSVCRT__ $(extra_include)
$(sysincludes)
EXTRA_lib32_libmsvcrt_a_DEPENDENCIES=lib32/msvcrt.def
+endif
lib32_LIBRARIES += lib32/libshell32.a
lib32_libshell32_a_SOURCES = $(src_libshell32)
@@ -499,7 +501,7 @@
lib32/libmapi32.a lib32/libmcd.a lib32/libmfcuia32.a
lib32/libmgmtapi.a lib32/libmprapi.a \
lib32/libmpr.a lib32/libmqrt.a lib32/libmsacm32.a
lib32/libmscms.a lib32/libmsdmo.a \
lib32/libmsi.a \
- lib32/libmsimg32.a lib32/libmsvcp60.a lib32/libmsvfw32.a
lib32/libmswsock.a lib32/libnddeapi.a \
+ lib32/libmsimg32.a lib32/libmsvfw32.a lib32/libmswsock.a
lib32/libnddeapi.a \
lib32/libndis.a lib32/libnetapi32.a lib32/libnewdev.a
lib32/libntdll.a lib32/libntoskrnl.a \
lib32/libodbc32.a lib32/libodbccp32.a lib32/libole32.a
lib32/liboleacc.a lib32/liboleaut32.a \
lib32/libolecli32.a lib32/liboledlg.a lib32/libolepro32.a
lib32/libolesvr32.a lib32/libopengl32.a \
@@ -516,9 +518,6 @@
\
lib32/libgpapi.a lib32/libgpedit.a lib32/libgpprefcl.a
lib32/libgpscript.a \
lib32/libgptext.a lib32/libmshtml.a lib32/libmshtmled.a \
- \
- lib32/libcrtdll.a lib32/libmsvcr80.a \
- \
lib32/libbcrypt.a lib32/libbthprops.a lib32/libclusapi.a
lib32/libcmutil.a \
lib32/libcredui.a lib32/libcryptnet.a lib32/libdavclnt.a
lib32/libdhcpcsvc6.a \
lib32/libdhcpsapi.a lib32/libdssec.a lib32/libdxva2.a
lib32/libeapp3hst.a \
@@ -536,10 +535,10 @@
lib32/libvsstrace.a lib32/libslwga.a lib32/libvss_ps.a
lib32/libtbs.a \
lib32/libtxfw32.a lib32/libmsctfmonitor.a lib32/libtdh.a
lib32/libwlanutil.a \
lib32/libwlanui.a lib32/libwlanapi.a lib32/libwer.a
lib32/libvirtdisk.a \
- lib32/libd2d1.a lib32/libauthz.a lib32/libwdscore.a
lib32/libmsvcr90d.a \
- lib32/libmsvcr90.a lib32/libcryptsp.a lib32/libbootvid.a
lib32/libwdscsl.a \
+ lib32/libd2d1.a lib32/libauthz.a lib32/libwdscore.a \
+ lib32/libcryptsp.a lib32/libbootvid.a lib32/libwdscsl.a \
lib32/libwdsutil.a lib32/libwdsclient.a lib32/libwdsimage.a
lib32/libwdsupgcompl.a \
- lib32/libmsvcr100.a lib32/libwdsclientapi.a lib32/libpcwum.a
lib32/libdbgeng.a \
+ lib32/libwdsclientapi.a lib32/libpcwum.a lib32/libdbgeng.a \
\
lib32/libcabinet.a lib32/libcryptxml.a lib32/libsspicli.a \
\
@@ -572,13 +571,13 @@
lib32/libxinput.a lib32/libxaudio.a lib32/libxaudiod.a \
lib32/libxapofx.a lib32/libx3daudio.a lib32/libd3dx9.a \
lib32/libd3dx10.a lib32/libd3dx11.a lib32/libd3dcsxd.a \
- lib32/libd3dcompiler.a lib32/libwinhttp.a lib32/libmsvcr110.a \
+ lib32/libd3dcompiler.a lib32/libwinhttp.a \
lib32/libdevmgr.a lib32/libdevobj.a lib32/libdevrtl.a \
lib32/libapi-ms-win-core-winrt-string-l1-1-0.a lib32/libruntimeobject.a \
lib32/libapi-ms-win-core-winrt-l1-1-0.a
if ! W32API
-lib32_DATA += lib32/libglut.a
+lib32_DATA += lib32/libglut.a lib32/libmsvcp60.a lib32/libmsvcr80.a
lib32/libmsvcr90.a lib32/libmsvcr90d.a lib32/libmsvcr100.a lib32/libmsvcr110.a
lib32/libcrtdll.a
endif
# combine these two rules with the ones for lib64
@@ -671,11 +670,13 @@
lib64_libkernel32_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) $(AM_CPPFLAGS)
lib64_libkernel32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
+if ! W32API
lib64_LIBRARIES += lib64/libmsvcrt.a
lib64_libmsvcrt_a_SOURCES = $(src_msvcrt) lib64/msvcrt.def.in
lib64_libmsvcrt_a_AR = $(DTDEF64) lib64/msvcrt.def && $(AR) $(ARFLAGS)
lib64_libmsvcrt_a_CPPFLAGS=$(CPPFLAGS64) -D__LIBMSVCRT__ $(extra_include)
$(sysincludes)
EXTRA_lib64_libmsvcrt_a_DEPENDENCIES=lib64/msvcrt.def
+endif
lib64_LIBRARIES += lib64/libshell32.a
lib64_libshell32_a_SOURCES = $(src_libshell32)
@@ -945,7 +946,7 @@
lib64/libmsoeacct.a lib64/libmsoe.a lib64/libmsoert2.a
lib64/libmspatcha.a lib64/libmspmsnsv.a \
lib64/libmsports.a lib64/libmsrating.a lib64/libmsrle32.a
lib64/libmssign32.a lib64/libmssip32.a \
lib64/libmstask.a lib64/libmstime.a lib64/libmstlsapi.a
lib64/libmstscax.a lib64/libmsutb.a \
- lib64/libmsv1_0.a lib64/libmsvcirt.a lib64/libmsvcp60.a
lib64/libmsvfw32.a lib64/libmsvidc32.a \
+ lib64/libmsv1_0.a lib64/libmsvcirt.a lib64/libmsvfw32.a
lib64/libmsvidc32.a \
lib64/libmsvidctl.a lib64/libmsw3prt.a lib64/libmswsock.a
lib64/libmsxactps.a lib64/libmsxml3.a \
lib64/libmsxs64.a lib64/libmsyuv.a lib64/libmtxclu.a
lib64/libmtxdm.a lib64/libmtxex.a \
lib64/libmtxoci.a lib64/libmycomput.a lib64/libmydocs.a
lib64/libnarrhook.a lib64/libncobjapi.a \
@@ -1034,9 +1035,6 @@
lib64/libclfsw32.a \
lib64/libdwmapi.a lib64/libntoskrnl.a lib64/libuxtheme.a \
lib64/libwtsapi32.a \
- \
- lib64/libcrtdll.a lib64/libmsvcr80.a \
- \
lib64/libbcrypt.a lib64/libbthprops.a lib64/libdhcpcsvc6.a
lib64/libdxva2.a lib64/libeappcfg.a \
lib64/libeappgnui.a lib64/libeapphost.a lib64/libeappprxy.a
lib64/libevr.a lib64/libiscsidsc.a \
lib64/libktmw32.a lib64/libmf.a lib64/libmfplat.a
lib64/libmsdrm.a lib64/libncrypt.a \
@@ -1049,7 +1047,7 @@
lib64/libtdh.a lib64/libtxfw32.a lib64/libwlanui.a
lib64/libwlanapi.a lib64/libwlanutil.a \
lib64/libwer.a lib64/libndis.a lib64/libd2d1.a
lib64/libwdscsl.a lib64/libpcwum.a \
lib64/libwdscore.a lib64/libcryptsp.a lib64/libwdsclient.a
lib64/libwdsupgcompl.a lib64/libwdsclientapi.a \
- lib64/libwdsutil.a lib64/libmsvcr90.a lib64/libmsvcr100.a
lib64/libmsvcr90d.a lib64/libwdsimage.a \
+ lib64/libwdsutil.a lib64/libwdsimage.a \
\
lib64/libcryptxml.a lib64/libsspicli.a \
\
@@ -1082,10 +1080,14 @@
lib64/libxinput.a lib64/libxaudio.a lib64/libxaudiod.a \
lib64/libxapofx.a lib64/libx3daudio.a lib64/libd3dx9.a \
lib64/libd3dx10.a lib64/libd3dx11.a lib64/libd3dcsxd.a \
- lib64/libd3dcompiler.a lib64/libwinhttp.a lib64/libmsvcr110.a \
+ lib64/libd3dcompiler.a lib64/libwinhttp.a \
lib64/libapi-ms-win-core-winrt-string-l1-1-0.a lib64/libruntimeobject.a \
lib64/libapi-ms-win-core-winrt-l1-1-0.a
+if ! W32API
+lib64_DATA += lib64/libmsvcp60.a lib64/libmsvcr80.a lib64/libmsvcr90.a
lib64/libmsvcr100.a lib64/libmsvcr90d.a lib64/libmsvcr110.a lib64/libcrtdll.a
+endif
+
lib64/libcrtdll.a lib64/libmsvcr80.a: lib64/lib%.a: lib64/%.def
$(DTDEF64) $< --dllname $*.dll
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Get your SQL database under version control now! Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out. http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
