--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/curl-1-fix-static.patch	Tue Jun 15 14:22:39 2010 +0200
@@ -0,0 +1,19 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch has been taken from:
+http://sourceforge.net/tracker/?func=detail&aid=3016471&group_id=976&atid=100976
+
+diff -r f9016ca5bace include/curl/curlbuild.h.in
+--- a/include/curl/curlbuild.h.in	Tue Jun 15 13:55:53 2010 +0200
++++ b/include/curl/curlbuild.h.in	Tue Jun 15 14:00:13 2010 +0200
+@@ -111,6 +111,9 @@
+ /*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
+ /* ================================================================ */
+ 
++/* Configure process defines this to 1 when static linking is requested. */
++#undef CURL_STATICLIB
++
+ /* Configure process defines this to 1 when it finds out that system  */
+ /* header file ws2tcpip.h must be included by the external interface. */
+ #undef CURL_PULL_WS2TCPIP_H

--- a/src/curl.mk	Mon Jun 14 21:22:54 2010 +0200
+++ b/src/curl.mk	Tue Jun 15 14:22:39 2010 +0200
@@ -19,8 +19,6 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i '/^#endif/ i#define CURL_STATICLIB' '$(1)/include/curl/curlbuild.h.in'
-    $(SED) -i 's,GNUTLS_ENABLED = 1,GNUTLS_ENABLED=1,' '$(1)/configure'
     # wine confuses the cross-compiling detection, so set it explicitly
     $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \

--- a/src/libarchive.mk	Mon Jun 14 21:22:54 2010 +0200
+++ b/src/libarchive.mk	Tue Jun 15 14:22:39 2010 +0200
@@ -28,4 +28,9 @@
         XML2_CONFIG='$(PREFIX)/$(TARGET)'/bin/xml2-config
     $(MAKE) -C '$(1)' -j '$(JOBS)' man_MANS=
     $(MAKE) -C '$(1)' -j 1 install man_MANS=
+
+    '$(TARGET)-gcc' \
+        -W -Wall -Werror -ansi -pedantic \
+        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libarchive.exe' \
+        -larchive
 endef