diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/curl-1-fixes.patch | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/curl-1-fixes.patch')
| -rw-r--r-- | src/curl-1-fixes.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/curl-1-fixes.patch b/src/curl-1-fixes.patch new file mode 100644 index 0000000..0b1ce01 --- /dev/null +++ b/src/curl-1-fixes.patch @@ -0,0 +1,33 @@ +This file is part of MXE. +See index.html for further information. + +Commits backported (cherry-picked) from upstream. +http://github.com/bagder/curl +Also contains MXE specific fixes. + +From ee69c33117cf616c19e9cd288f08eb4c91bf190d Mon Sep 17 00:00:00 2001 +From: Volker Grabsch <vog@notjusthosting.com> +Date: Fri, 28 Oct 2011 13:48:04 +0200 +Subject: [PATCH] static linking for MXE + +--- + include/curl/curlbuild.h.in | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/include/curl/curlbuild.h.in b/include/curl/curlbuild.h.in +index fe348f4..c428273 100644 +--- a/include/curl/curlbuild.h.in ++++ b/include/curl/curlbuild.h.in +@@ -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 +-- +1.7.8.3 + |