summaryrefslogtreecommitdiff
path: root/meta/packages/curl
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-03-25 12:16:45 +0000
committerJoshua Lock <josh@linux.intel.com>2010-03-26 10:29:18 +0000
commita2d5806f5d5eebea3828b18cffa3cb0df327a9b8 (patch)
treeaa60397077f5566e96061798af448ec4f7164dba /meta/packages/curl
parent555f60faa0bcaa0d3faab7ccf12e8c663f9ba51c (diff)
downloadopenembedded-core-a2d5806f5d5eebea3828b18cffa3cb0df327a9b8.tar.gz
openembedded-core-a2d5806f5d5eebea3828b18cffa3cb0df327a9b8.tar.bz2
openembedded-core-a2d5806f5d5eebea3828b18cffa3cb0df327a9b8.zip
curl: Bump to 7.20
Newer libcurl is needed by newer pycurl which is needed by newer yum Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/packages/curl')
-rw-r--r--meta/packages/curl/curl/pkgconfig_fix.patch20
-rw-r--r--meta/packages/curl/curl_7.20.0.bb (renamed from meta/packages/curl/curl_7.18.0.bb)0
2 files changed, 10 insertions, 10 deletions
diff --git a/meta/packages/curl/curl/pkgconfig_fix.patch b/meta/packages/curl/curl/pkgconfig_fix.patch
index e02316a73a..a59d39b8b1 100644
--- a/meta/packages/curl/curl/pkgconfig_fix.patch
+++ b/meta/packages/curl/curl/pkgconfig_fix.patch
@@ -1,22 +1,22 @@
-Index: curl-7.16.4/libcurl.pc.in
+Index: curl-7.20.0/libcurl.pc.in
===================================================================
---- curl-7.16.4.orig/libcurl.pc.in 2007-02-18 09:41:27.000000000 +0000
-+++ curl-7.16.4/libcurl.pc.in 2008-03-18 11:42:43.000000000 +0000
-@@ -33,6 +33,7 @@
+--- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000
++++ curl-7.20.0/libcurl.pc.in 2010-03-25 12:13:26.814051066 +0000
+@@ -35,6 +35,7 @@
URL: http://curl.haxx.se/
Description: Library to transfer files with ftp, http, etc.
Version: @VERSION@
--Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+-Libs: -L${libdir} -lcurl @LIBS@
-Libs.private: @LIBCURL_LIBS@ @LIBS@
+Requires.private: @GNUTLS_REQUIRED@
+Libs: -L${libdir} -lcurl
+Libs.private: -ldl -lz
Cflags: -I${includedir}
-Index: curl-7.16.4/configure.ac
+Index: curl-7.20.0/configure.ac
===================================================================
---- curl-7.16.4.orig/configure.ac 2008-03-18 11:40:30.000000000 +0000
-+++ curl-7.16.4/configure.ac 2008-03-18 11:42:06.000000000 +0000
-@@ -1361,6 +1361,7 @@
+--- curl-7.20.0.orig/configure.ac 2010-02-04 21:41:46.000000000 +0000
++++ curl-7.20.0/configure.ac 2010-03-25 12:12:18.673129001 +0000
+@@ -1668,6 +1668,7 @@
AC_SUBST(USE_GNUTLS, [1])
GNUTLS_ENABLED=1
USE_GNUTLS="yes"
@@ -24,7 +24,7 @@ Index: curl-7.16.4/configure.ac
curl_ssl_msg="enabled (GnuTLS)"
],
[
-@@ -1387,6 +1388,8 @@
+@@ -1696,6 +1697,8 @@
fi dnl OPENSSL != 1
diff --git a/meta/packages/curl/curl_7.18.0.bb b/meta/packages/curl/curl_7.20.0.bb
index 19b46faf26..19b46faf26 100644
--- a/meta/packages/curl/curl_7.18.0.bb
+++ b/meta/packages/curl/curl_7.20.0.bb