diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-03-31 13:21:38 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-03-31 13:21:38 +0200 |
| commit | 27a769544799e45c1d91911c961edc76c070e0f4 (patch) | |
| tree | 33fee6f635c8215823e104c5bd4e3fbd580a1655 | |
| parent | 3f2507bb032908c6ad9f11c61a52229f3e33298d (diff) | |
| parent | 292ac2bde916a0b50c4b6b8cbbfc67ed7c356d2d (diff) | |
CWS-TOOLING: integrate CWS mingwport29
Notes
Notes:
split repo tag: libs-extern-sys_ooo/DEV300_m76
| -rw-r--r-- | curl/curl-7.19.7_mingw.patch | 24 | ||||
| -rw-r--r-- | curl/makefile.mk | 5 |
2 files changed, 28 insertions, 1 deletions
diff --git a/curl/curl-7.19.7_mingw.patch b/curl/curl-7.19.7_mingw.patch new file mode 100644 index 000000000000..b0fa6736d901 --- /dev/null +++ b/curl/curl-7.19.7_mingw.patch @@ -0,0 +1,24 @@ +--- misc/curl-7.19.7/lib/setup.h 2009-10-29 05:21:58.000000000 +0900 ++++ misc/build/curl-7.19.7/lib/setup.h 2010-03-02 06:03:10.009500000 +0900 +@@ -40,6 +40,21 @@ + + #include "curl_config.h" + ++#ifdef __MINGW32__ ++#undef HAVE_DLFCN_H ++#define HAVE_GETHOSTBYADDR 1 ++#define HAVE_GETHOSTBYNAME 1 ++#undef HAVE_LIBZ ++#undef HAVE_NETDB_H ++#undef HAVE_POLL_H ++#undef HAVE_SYS_IOCTL_H ++#undef HAVE_SYS_POLL_H ++#undef HAVE_SYS_UIO_H ++#undef HAVE_TERMIOS_H ++#undef HAVE_TERMIO_H ++#undef HAVE_ZLIB_H ++#endif ++ + #else /* HAVE_CONFIG_H */ + + #ifdef _WIN32_WCE diff --git a/curl/makefile.mk b/curl/makefile.mk index d129b7be2411..f54d72ce8a44 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -46,6 +46,9 @@ PATCH_FILES=curl-7.19.7.patch .IF "$(GUI)"=="WNT" PATCH_FILES+=curl-7.19.7_win.patch + .IF "$(COM)"=="GCC" + PATCH_FILES+=curl-7.19.7_mingw.patch + .ENDIF .ENDIF @@ -96,7 +99,7 @@ curl_LIBS+=-lstdc++_s CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS= --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(curl_CC)" OBJDUMP="$(WRAPCMD) objdump" CFLAGS=-D_MT LDFLAGS="-L$(ILIB:s/;/ -L/)" LIBS="$(curl_LIBS)" +CONFIGURE_FLAGS= --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(curl_CC)" CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" CFLAGS=-D_MT LDFLAGS="-L$(ILIB:s/;/ -L/)" LIBS="$(curl_LIBS)" BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_ACTION=make OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll |