diff options
| author |   Marko Lindqvist <cazfi74@gmail.com> | 2013-02-17 10:53:10 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-22 05:52:26 -0800 |
| commit | b0c541236b4c4670ce77f55886b6ce02c562b8c2 (patch) | |
| tree | 914a0d3ba7298663a4518c0d761d6dcc0e465253 /meta/recipes-support/curl/curl | |
| parent | 254799258ead1b7a59c301ad2d3e3c7e5b9fb8db (diff) | |
| download | openembedded-core-b0c541236b4c4670ce77f55886b6ce02c562b8c2.tar.gz | |
curl: update to upstream version 7.29.0
- obsolete_automake_macros.patch removed as it's part of upstream.
- dont_override_ac_config_macro_dir.patch removed as no longer needed.
- pkgconfig_fix.patch updated to apply cleanly
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/curl/curl')
| -rw-r--r-- | meta/recipes-support/curl/curl/pkgconfig_fix.patch | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch index 7f4ef7daf6..5d8769d522 100644 --- a/meta/recipes-support/curl/curl/pkgconfig_fix.patch +++ b/meta/recipes-support/curl/curl/pkgconfig_fix.patch @@ -1,9 +1,9 @@ Upstream-Status: Inappropriate [packaging] -diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac ---- curl-7.28.1/configure.ac 2012-09-08 23:39:18.000000000 +0300 -+++ curl-7.28.1/configure.ac 2012-12-25 03:41:29.948026351 +0200 -@@ -1863,6 +1863,7 @@ +diff -Nurd curl-7.29.0/configure.ac curl-7.29.0/configure.ac +--- curl-7.29.0/configure.ac 2013-02-06 11:47:19.000000000 +0200 ++++ curl-7.29.0/configure.ac 2013-02-16 12:32:22.132327764 +0200 +@@ -1883,6 +1883,7 @@ AC_SUBST(USE_GNUTLS, [1]) GNUTLS_ENABLED=1 USE_GNUTLS="yes" @@ -11,7 +11,7 @@ diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac curl_ssl_msg="enabled (GnuTLS)" ], [ -@@ -1933,6 +1934,8 @@ +@@ -1953,6 +1954,8 @@ ]) fi @@ -20,16 +20,13 @@ diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac dnl ---------------------------------------------------- dnl check for PolarSSL dnl ---------------------------------------------------- -diff -Nurd curl-7.28.1/libcurl.pc.in curl-7.28.1/libcurl.pc.in ---- curl-7.28.1/libcurl.pc.in 2012-08-08 23:45:18.000000000 +0300 -+++ curl-7.28.1/libcurl.pc.in 2012-12-25 03:43:23.564023858 +0200 -@@ -34,6 +34,7 @@ - URL: http://curl.haxx.se/ +diff -Nurd curl-7.29.0/libcurl.pc.in curl-7.29.0/libcurl.pc.in +--- curl-7.29.0/libcurl.pc.in 2012-12-12 00:32:22.000000000 +0200 ++++ curl-7.29.0/libcurl.pc.in 2013-02-16 12:33:27.063844337 +0200 +@@ -35,5 +35,5 @@ Description: Library to transfer files with ftp, http, etc. Version: @CURLVERSION@ --Libs: -L${libdir} -lcurl @LIBS@ --Libs.private: @LIBCURL_LIBS@ @LIBS@ -+Requires.private: @GNUTLS_REQUIRED@ -+Libs: -L${libdir} -lcurl + Libs: -L${libdir} -lcurl +-Libs.private: @LIBCURL_LIBS@ +Libs.private: -ldl -lz Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ |