diff options
author | Qing He <qing.he@intel.com> | 2011-04-22 10:07:25 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-04 00:54:41 +0100 |
commit | b9e63d96addd5fa1d69877e9a58e6ea92482e19b (patch) | |
tree | 4413cb59355a85fbea7b8caa0e1670014b9220fe /meta/recipes-support/curl/curl | |
parent | 3ef65ef34f170965ed2b0552ea260b09279719f0 (diff) | |
download | poky-b9e63d96addd5fa1d69877e9a58e6ea92482e19b.tar.gz |
curl: upgrade to version 7.21.6
from 7.21.2
(From OE-Core rev: 7b26788c52136eb6a95507758936756b3dfcbaa4)
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl/curl')
-rw-r--r-- | meta/recipes-support/curl/curl/noldlibpath.patch | 2 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl/pkgconfig_fix.patch | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch index a3319a23e3..f4c72a1c1c 100644 --- a/meta/recipes-support/curl/curl/noldlibpath.patch +++ b/meta/recipes-support/curl/curl/noldlibpath.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
1 | Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling. | 3 | Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling. |
2 | Since we never run compiled binaries for the target, we should *never* need | 4 | Since we never run compiled binaries for the target, we should *never* need |
3 | to change LD_LIBRARY_PATH. | 5 | to change LD_LIBRARY_PATH. |
diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch index a59d39b8b1..ad73c00885 100644 --- a/meta/recipes-support/curl/curl/pkgconfig_fix.patch +++ b/meta/recipes-support/curl/curl/pkgconfig_fix.patch | |||
@@ -1,3 +1,6 @@ | |||
1 | Upstream-Status: Inappropriate [packaging] | ||
2 | |||
3 | |||
1 | Index: curl-7.20.0/libcurl.pc.in | 4 | Index: curl-7.20.0/libcurl.pc.in |
2 | =================================================================== | 5 | =================================================================== |
3 | --- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000 | 6 | --- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000 |
@@ -5,7 +8,7 @@ Index: curl-7.20.0/libcurl.pc.in | |||
5 | @@ -35,6 +35,7 @@ | 8 | @@ -35,6 +35,7 @@ |
6 | URL: http://curl.haxx.se/ | 9 | URL: http://curl.haxx.se/ |
7 | Description: Library to transfer files with ftp, http, etc. | 10 | Description: Library to transfer files with ftp, http, etc. |
8 | Version: @VERSION@ | 11 | Version: @CURLVERSION@ |
9 | -Libs: -L${libdir} -lcurl @LIBS@ | 12 | -Libs: -L${libdir} -lcurl @LIBS@ |
10 | -Libs.private: @LIBCURL_LIBS@ @LIBS@ | 13 | -Libs.private: @LIBCURL_LIBS@ @LIBS@ |
11 | +Requires.private: @GNUTLS_REQUIRED@ | 14 | +Requires.private: @GNUTLS_REQUIRED@ |