diff options
Diffstat (limited to 'package/curl/patches')
| -rw-r--r-- | package/curl/patches/patch-configure | 17 | ||||
| -rw-r--r-- | package/curl/patches/patch-include_curl_curlbuild_h | 581 | ||||
| -rw-r--r-- | package/curl/patches/patch-lib_Makefile_in | 11 | ||||
| -rw-r--r-- | package/curl/patches/patch-ltmain_sh | 14 |
4 files changed, 19 insertions, 604 deletions
diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure index 8522ba6c5..b930df6e4 100644 --- a/package/curl/patches/patch-configure +++ b/package/curl/patches/patch-configure @@ -1,6 +1,6 @@ ---- curl-7.21.4.orig/configure 2011-01-30 19:07:52.000000000 +0100 -+++ curl-7.21.4/configure 2011-03-04 18:42:33.000000000 +0100 -@@ -19799,15 +19799,6 @@ fi +--- curl-7.22.0.orig/configure 2011-09-12 22:22:04.000000000 +0200 ++++ curl-7.22.0/configure 2011-10-15 03:05:05.000000000 +0200 +@@ -20641,14 +20641,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -12,7 +12,14 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 -$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} - fi -- fi - fi + # + +@@ -21230,7 +21222,6 @@ $as_echo "$as_me: WARNING: $tst_warns" > + + fi + +-fi + + diff --git a/package/curl/patches/patch-include_curl_curlbuild_h b/package/curl/patches/patch-include_curl_curlbuild_h deleted file mode 100644 index f1ff6a245..000000000 --- a/package/curl/patches/patch-include_curl_curlbuild_h +++ /dev/null @@ -1,581 +0,0 @@ ---- curl-7.21.4.orig/include/curl/curlbuild.h 2011-02-17 13:20:43.000000000 +0100 -+++ curl-7.21.4/include/curl/curlbuild.h 2011-03-04 18:43:20.000000000 +0100 -@@ -1,3 +1,4 @@ -+/* include/curl/curlbuild.h. Generated from curlbuild.h.in by configure. */ - #ifndef __CURL_CURLBUILD_H - #define __CURL_CURLBUILD_H - /*************************************************************************** -@@ -7,7 +8,7 @@ - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * -- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. -+ * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms -@@ -30,20 +31,6 @@ - * NOTE 1: - * ------- - * -- * See file include/curl/curlbuild.h.in, run configure, and forget -- * that this file exists it is only used for non-configure systems. -- * But you can keep reading if you want ;-) -- * -- */ -- --/* ================================================================ */ --/* NOTES FOR NON-CONFIGURE SYSTEMS */ --/* ================================================================ */ -- --/* -- * NOTE 1: -- * ------- -- * - * Nothing in this file is intended to be modified or adjusted by the - * curl library user nor by the curl library builder. - * -@@ -51,57 +38,20 @@ - * or fixed in this file, then, report it on the libcurl development - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/ - * -- * Try to keep one section per platform, compiler and architecture, -- * otherwise, if an existing section is reused for a different one and -- * later on the original is adjusted, probably the piggybacking one can -- * be adversely changed. -- * -- * In order to differentiate between platforms/compilers/architectures -- * use only compiler built in predefined preprocessor symbols. -- * - * This header file shall only export symbols which are 'curl' or 'CURL' - * prefixed, otherwise public name space would be polluted. - * - * NOTE 2: - * ------- - * -- * For any given platform/compiler curl_off_t must be typedef'ed to a -- * 64-bit wide signed integral data type. The width of this data type -- * must remain constant and independent of any possible large file -- * support settings. -- * -- * As an exception to the above, curl_off_t shall be typedef'ed to a -- * 32-bit wide signed integral data type if there is no 64-bit type. -- * -- * As a general rule, curl_off_t shall not be mapped to off_t. This -- * rule shall only be violated if off_t is the only 64-bit data type -- * available and the size of off_t is independent of large file support -- * settings. Keep your build on the safe side avoiding an off_t gating. -- * If you have a 64-bit off_t then take for sure that another 64-bit -- * data type exists, dig deeper and you will find it. -- * -- * NOTE 3: -- * ------- -- * -- * Right now you might be staring at file include/curl/curlbuild.h.dist or -+ * Right now you might be staring at file include/curl/curlbuild.h.in or - * at file include/curl/curlbuild.h, this is due to the following reason: -- * file include/curl/curlbuild.h.dist is renamed to include/curl/curlbuild.h -- * when the libcurl source code distribution archive file is created. -- * -- * File include/curl/curlbuild.h.dist is not included in the distribution -- * archive. File include/curl/curlbuild.h is not present in the git tree. -- * -- * The distributed include/curl/curlbuild.h file is only intended to be used -- * on systems which can not run the also distributed configure script. - * - * On systems capable of running the configure script, the configure process - * will overwrite the distributed include/curl/curlbuild.h file with one that - * is suitable and specific to the library being configured and built, which - * is generated from the include/curl/curlbuild.h.in template file. - * -- * If you check out from git on a non-configure platform, you must run the -- * appropriate buildconf* script to set up curlbuild.h and other local files. -- * - */ - - /* ================================================================ */ -@@ -159,425 +109,83 @@ - #endif - - /* ================================================================ */ --/* EXTERNAL INTERFACE SETTINGS FOR NON-CONFIGURE SYSTEMS ONLY */ -+/* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ - /* ================================================================ */ - --#if defined(__DJGPP__) || defined(__GO32__) --# if defined(__DJGPP__) && (__DJGPP__ > 1) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__SALFORDC__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__BORLANDC__) --# if (__BORLANDC__ < 0x520) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T i64 --# define CURL_SUFFIX_CURL_OFF_TU ui64 --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__TURBOC__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__WATCOMC__) --# if defined(__386__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T i64 --# define CURL_SUFFIX_CURL_OFF_TU ui64 --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__POCC__) --# if (__POCC__ < 280) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# elif defined(_MSC_VER) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T i64 --# define CURL_SUFFIX_CURL_OFF_TU ui64 --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__LCC__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__SYMBIAN32__) --# if defined(__EABI__) /* Treat all ARM compilers equally */ --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# elif defined(__CW32__) --# pragma longlong on --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# elif defined(__VC32__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL -+/* 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 */ -+#ifdef CURL_PULL_WS2TCPIP_H -+# ifndef WIN32_LEAN_AND_MEAN -+# define WIN32_LEAN_AND_MEAN - # endif --# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__MWERKS__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(_WIN32_WCE) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T i64 --# define CURL_SUFFIX_CURL_OFF_TU ui64 --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__MINGW32__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+# include <windows.h> -+# include <winsock2.h> -+# include <ws2tcpip.h> -+#endif - --#elif defined(__VMS) --# if defined(__VAX) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+/* Configure process defines this to 1 when it finds out that system */ -+/* header file sys/types.h must be included by the external interface. */ -+#define CURL_PULL_SYS_TYPES_H 1 -+#ifdef CURL_PULL_SYS_TYPES_H -+# include <sys/types.h> -+#endif - --#elif defined(__OS400__) --# if defined(__ILEC400__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 --# define CURL_PULL_SYS_TYPES_H 1 --# define CURL_PULL_SYS_SOCKET_H 1 --# endif -+/* Configure process defines this to 1 when it finds out that system */ -+/* header file stdint.h must be included by the external interface. */ -+#define CURL_PULL_STDINT_H 1 -+#ifdef CURL_PULL_STDINT_H -+# include <stdint.h> -+#endif - --#elif defined(__MVS__) --# if defined(__IBMC__) || defined(__IBMCPP__) --# if defined(_ILP32) --# define CURL_SIZEOF_LONG 4 --# elif defined(_LP64) --# define CURL_SIZEOF_LONG 8 --# endif --# if defined(_LONG_LONG) --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# elif defined(_LP64) --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# else --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 --# define CURL_PULL_SYS_TYPES_H 1 --# define CURL_PULL_SYS_SOCKET_H 1 --# endif -+/* Configure process defines this to 1 when it finds out that system */ -+/* header file inttypes.h must be included by the external interface. */ -+#define CURL_PULL_INTTYPES_H 1 -+#ifdef CURL_PULL_INTTYPES_H -+# include <inttypes.h> -+#endif - --#elif defined(__370__) --# if defined(__IBMC__) || defined(__IBMCPP__) --# if defined(_ILP32) --# define CURL_SIZEOF_LONG 4 --# elif defined(_LP64) --# define CURL_SIZEOF_LONG 8 --# endif --# if defined(_LONG_LONG) --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# elif defined(_LP64) --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# else --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 --# define CURL_PULL_SYS_TYPES_H 1 --# define CURL_PULL_SYS_SOCKET_H 1 --# endif -+/* Configure process defines this to 1 when it finds out that system */ -+/* header file sys/socket.h must be included by the external interface. */ -+#define CURL_PULL_SYS_SOCKET_H 1 -+#ifdef CURL_PULL_SYS_SOCKET_H -+# include <sys/socket.h> -+#endif - --#elif defined(TPF) --# define CURL_SIZEOF_LONG 8 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+/* The size of `long', as computed by sizeof. */ -+#define CURL_SIZEOF_LONG 4 - --/* ===================================== */ --/* KEEP MSVC THE PENULTIMATE ENTRY */ --/* ===================================== */ -+/* Integral data type used for curl_socklen_t. */ -+#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t - --#elif defined(_MSC_VER) --# if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T i64 --# define CURL_SUFFIX_CURL_OFF_TU ui64 --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+/* The size of `curl_socklen_t', as computed by sizeof. */ -+#define CURL_SIZEOF_CURL_SOCKLEN_T 4 - --/* ===================================== */ --/* KEEP GENERIC GCC THE LAST ENTRY */ --/* ===================================== */ -+/* Data type definition of curl_socklen_t. */ -+typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; - --#elif defined(__GNUC__) --# if defined(__i386__) || defined(__ppc__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# elif defined(__x86_64__) || defined(__ppc64__) --# define CURL_SIZEOF_LONG 8 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 --# define CURL_PULL_SYS_TYPES_H 1 --# define CURL_PULL_SYS_SOCKET_H 1 -+/* Signed integral data type used for curl_off_t. */ -+#define CURL_TYPEOF_CURL_OFF_T int64_t - --#else --# error "Unknown non-configure build target!" -- Error Compilation_aborted_Unknown_non_configure_build_target --#endif -+/* Data type definition of curl_off_t. */ -+typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; - --/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file */ --/* sys/types.h is required here to properly make type definitions below. */ --#ifdef CURL_PULL_SYS_TYPES_H --# include <sys/types.h> --#endif -+/* curl_off_t formatting string directive without "%" conversion specifier. */ -+#define CURL_FORMAT_CURL_OFF_T "lld" - --/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file */ --/* sys/socket.h is required here to properly make type definitions below. */ --#ifdef CURL_PULL_SYS_SOCKET_H --# include <sys/socket.h> --#endif -+/* unsigned curl_off_t formatting string without "%" conversion specifier. */ -+#define CURL_FORMAT_CURL_OFF_TU "llu" - --/* Data type definition of curl_socklen_t. */ -+/* curl_off_t formatting string directive with "%" conversion specifier. */ -+#define CURL_FORMAT_OFF_T "%lld" - --#ifdef CURL_TYPEOF_CURL_SOCKLEN_T -- typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; --#endif -+/* The size of `curl_off_t', as computed by sizeof. */ -+#define CURL_SIZEOF_CURL_OFF_T 8 - --/* Data type definition of curl_off_t. */ -+/* curl_off_t constant suffix. */ -+#define CURL_SUFFIX_CURL_OFF_T LL - --#ifdef CURL_TYPEOF_CURL_OFF_T -- typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; --#endif -+/* unsigned curl_off_t constant suffix. */ -+#define CURL_SUFFIX_CURL_OFF_TU ULL - - #endif /* __CURL_CURLBUILD_H */ diff --git a/package/curl/patches/patch-lib_Makefile_in b/package/curl/patches/patch-lib_Makefile_in deleted file mode 100644 index 65cc0f8b9..000000000 --- a/package/curl/patches/patch-lib_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- curl-7.21.4.orig/lib/Makefile.in 2011-02-02 13:22:52.000000000 +0100 -+++ curl-7.21.4/lib/Makefile.in 2011-03-04 18:46:09.000000000 +0100 -@@ -412,7 +412,7 @@ CLEANFILES = $(DSP) $(VCPROJ) - lib_LTLIBRARIES = libcurl.la - - # This might hold -Werror --libcurl_la_CFLAGS = $(CFLAGS) @CURL_CFLAG_EXTRAS@ -+libcurl_la_CFLAGS = @CURL_CFLAG_EXTRAS@ - @USE_EMBEDDED_ARES_FALSE@INCLUDES = -I$(top_builddir)/include/curl \ - @USE_EMBEDDED_ARES_FALSE@ -I$(top_builddir)/include \ - @USE_EMBEDDED_ARES_FALSE@ -I$(top_srcdir)/include \ diff --git a/package/curl/patches/patch-ltmain_sh b/package/curl/patches/patch-ltmain_sh index b1eef4628..5b2293c22 100644 --- a/package/curl/patches/patch-ltmain_sh +++ b/package/curl/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- curl-7.21.0.orig/ltmain.sh 2010-05-27 21:20:16.000000000 +0200 -+++ curl-7.21.0/ltmain.sh 2011-01-14 12:07:25.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +--- curl-7.22.0.orig/ltmain.sh 2011-09-12 22:21:51.000000000 +0200 ++++ curl-7.22.0/ltmain.sh 2011-10-15 03:03:37.000000000 +0200 +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" |