summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-04-22 10:07:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-04 00:54:41 +0100
commitb9e63d96addd5fa1d69877e9a58e6ea92482e19b (patch)
tree4413cb59355a85fbea7b8caa0e1670014b9220fe /meta
parent3ef65ef34f170965ed2b0552ea260b09279719f0 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-support/curl/curl/noldlibpath.patch2
-rw-r--r--meta/recipes-support/curl/curl/pkgconfig_fix.patch5
-rw-r--r--meta/recipes-support/curl/curl_7.21.6.bb (renamed from meta/recipes-support/curl/curl_7.21.2.bb)6
3 files changed, 9 insertions, 4 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 @@
1Upstream-Status: Inappropriate [embedded specific]
2
1Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling. 3Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling.
2Since we never run compiled binaries for the target, we should *never* need 4Since we never run compiled binaries for the target, we should *never* need
3to change LD_LIBRARY_PATH. 5to 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 @@
1Upstream-Status: Inappropriate [packaging]
2
3
1Index: curl-7.20.0/libcurl.pc.in 4Index: 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@
diff --git a/meta/recipes-support/curl/curl_7.21.2.bb b/meta/recipes-support/curl/curl_7.21.6.bb
index cc8bbf1a17..51e14f9c3d 100644
--- a/meta/recipes-support/curl/curl_7.21.2.bb
+++ b/meta/recipes-support/curl/curl_7.21.6.bb
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
8DEPENDS = "zlib gnutls" 8DEPENDS = "zlib gnutls"
9DEPENDS_virtclass-native = "zlib-native" 9DEPENDS_virtclass-native = "zlib-native"
10DEPENDS_virtclass-nativesdk = "zlib-nativesdk" 10DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
11PR = "r1" 11PR = "r0"
12 12
13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
14 file://noldlibpath.patch \ 14 file://noldlibpath.patch \
15 file://pkgconfig_fix.patch" 15 file://pkgconfig_fix.patch"
16 16
17SRC_URI[md5sum] = "ca96df88e044c7c25d19692ec8b250b2" 17SRC_URI[md5sum] = "6611989a81ebd7b03a35adc3001ddee0"
18SRC_URI[sha256sum] = "f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21" 18SRC_URI[sha256sum] = "d9a3d3593796147ad9ca994c9e6834a42b49756420a10e996dbf849495d3d955"
19 19
20inherit autotools pkgconfig binconfig 20inherit autotools pkgconfig binconfig
21 21