Mercurial > mxe-octave
changeset 1054:37daf336dd20
provide a proper patch for the static linking problem of package curl
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Tue, 15 Jun 2010 14:21:00 +0200 |
| parents | 84ba1fd35443 |
| children | 377f3abd52f8 |
| files | src/curl-1-fix-static.patch src/curl.mk |
| diffstat | 2 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/curl-1-fix-static.patch Tue Jun 15 14:21:00 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 Tue Jun 15 14:02:16 2010 +0200 +++ b/src/curl.mk Tue Jun 15 14:21:00 2010 +0200 @@ -19,7 +19,6 @@ 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 \