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:50:47 +0100 |
commit | 7b26788c52136eb6a95507758936756b3dfcbaa4 (patch) | |
tree | 4c4242f02668839627c2fd39fde53326de70280e /meta/recipes-support/curl/curl | |
parent | 06acddec116a14b7574d2008e4397e50b4d5e753 (diff) | |
download | openembedded-core-7b26788c52136eb6a95507758936756b3dfcbaa4.tar.gz |
curl: upgrade to version 7.21.6
from 7.21.2
Signed-off-by: Qing He <qing.he@intel.com>
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 @@ +Upstream-Status: Inappropriate [embedded specific] + Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling. Since we never run compiled binaries for the target, we should *never* need 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 @@ +Upstream-Status: Inappropriate [packaging] + + Index: curl-7.20.0/libcurl.pc.in =================================================================== --- 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 @@ -35,6 +35,7 @@ URL: http://curl.haxx.se/ Description: Library to transfer files with ftp, http, etc. - Version: @VERSION@ + Version: @CURLVERSION@ -Libs: -L${libdir} -lcurl @LIBS@ -Libs.private: @LIBCURL_LIBS@ @LIBS@ +Requires.private: @GNUTLS_REQUIRED@ |