strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmcfixes74: merge with DEV300 m76

Browse source
This commit is contained in:
Caolán McNamara 2010-04-09 09:31:27 +01:00
commit 175dcecf3a
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
curl/curl-7.19.7_mingw.patch Normal file
View file

@ -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

5
curl/makefile.mk
View file

@ -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