summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/curl-1-fix-static.patch19
-rw-r--r--src/curl.mk1
2 files changed, 19 insertions, 1 deletions
diff --git a/src/curl-1-fix-static.patch b/src/curl-1-fix-static.patch
new file mode 100644
index 0000000..06b227e
--- /dev/null
+++ b/src/curl-1-fix-static.patch
@@ -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
diff --git a/src/curl.mk b/src/curl.mk
index 6d9432e..0d03d9b 100644
--- a/src/curl.mk
+++ b/src/curl.mk
@@ -19,7 +19,6 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
- $(SED) -i '/^#endif/ i#define CURL_STATICLIB' '$(1)/include/curl/curlbuild.h.in'
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
cd '$(1)' && ./configure \