From b9e63d96addd5fa1d69877e9a58e6ea92482e19b Mon Sep 17 00:00:00 2001 From: Qing He Date: Fri, 22 Apr 2011 10:07:25 +0800 Subject: curl: upgrade to version 7.21.6 from 7.21.2 (From OE-Core rev: 7b26788c52136eb6a95507758936756b3dfcbaa4) Signed-off-by: Qing He Signed-off-by: Richard Purdie --- meta/recipes-support/curl/curl/noldlibpath.patch | 2 ++ meta/recipes-support/curl/curl/pkgconfig_fix.patch | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/recipes-support/curl/curl') 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@ -- cgit v1.2.3-54-g00ecf