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 06:09:20 -0800 |
commit | 2d898ad4a926065dbb04d4a8d77228d9ab3f1225 (patch) | |
tree | 2d63363034ea80f528dbf53e8852f0ceed262399 /meta/recipes-support/curl/curl | |
parent | 05ad2468666540712a6e37526e4cf6ab1f2d91db (diff) | |
download | poky-2d898ad4a926065dbb04d4a8d77228d9ab3f1225.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
(From OE-Core rev: b0c541236b4c4670ce77f55886b6ce02c562b8c2)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ | |||
1 | Upstream-Status: Inappropriate [packaging] | 1 | Upstream-Status: Inappropriate [packaging] |
2 | 2 | ||
3 | diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac | 3 | diff -Nurd curl-7.29.0/configure.ac curl-7.29.0/configure.ac |
4 | --- curl-7.28.1/configure.ac 2012-09-08 23:39:18.000000000 +0300 | 4 | --- curl-7.29.0/configure.ac 2013-02-06 11:47:19.000000000 +0200 |
5 | +++ curl-7.28.1/configure.ac 2012-12-25 03:41:29.948026351 +0200 | 5 | +++ curl-7.29.0/configure.ac 2013-02-16 12:32:22.132327764 +0200 |
6 | @@ -1863,6 +1863,7 @@ | 6 | @@ -1883,6 +1883,7 @@ |
7 | AC_SUBST(USE_GNUTLS, [1]) | 7 | AC_SUBST(USE_GNUTLS, [1]) |
8 | GNUTLS_ENABLED=1 | 8 | GNUTLS_ENABLED=1 |
9 | USE_GNUTLS="yes" | 9 | USE_GNUTLS="yes" |
@@ -11,7 +11,7 @@ diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac | |||
11 | curl_ssl_msg="enabled (GnuTLS)" | 11 | curl_ssl_msg="enabled (GnuTLS)" |
12 | ], | 12 | ], |
13 | [ | 13 | [ |
14 | @@ -1933,6 +1934,8 @@ | 14 | @@ -1953,6 +1954,8 @@ |
15 | ]) | 15 | ]) |
16 | fi | 16 | fi |
17 | 17 | ||
@@ -20,16 +20,13 @@ diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac | |||
20 | dnl ---------------------------------------------------- | 20 | dnl ---------------------------------------------------- |
21 | dnl check for PolarSSL | 21 | dnl check for PolarSSL |
22 | dnl ---------------------------------------------------- | 22 | dnl ---------------------------------------------------- |
23 | diff -Nurd curl-7.28.1/libcurl.pc.in curl-7.28.1/libcurl.pc.in | 23 | diff -Nurd curl-7.29.0/libcurl.pc.in curl-7.29.0/libcurl.pc.in |
24 | --- curl-7.28.1/libcurl.pc.in 2012-08-08 23:45:18.000000000 +0300 | 24 | --- curl-7.29.0/libcurl.pc.in 2012-12-12 00:32:22.000000000 +0200 |
25 | +++ curl-7.28.1/libcurl.pc.in 2012-12-25 03:43:23.564023858 +0200 | 25 | +++ curl-7.29.0/libcurl.pc.in 2013-02-16 12:33:27.063844337 +0200 |
26 | @@ -34,6 +34,7 @@ | 26 | @@ -35,5 +35,5 @@ |
27 | URL: http://curl.haxx.se/ | ||
28 | Description: Library to transfer files with ftp, http, etc. | 27 | Description: Library to transfer files with ftp, http, etc. |
29 | Version: @CURLVERSION@ | 28 | Version: @CURLVERSION@ |
30 | -Libs: -L${libdir} -lcurl @LIBS@ | 29 | Libs: -L${libdir} -lcurl |
31 | -Libs.private: @LIBCURL_LIBS@ @LIBS@ | 30 | -Libs.private: @LIBCURL_LIBS@ |
32 | +Requires.private: @GNUTLS_REQUIRED@ | ||
33 | +Libs: -L${libdir} -lcurl | ||
34 | +Libs.private: -ldl -lz | 31 | +Libs.private: -ldl -lz |
35 | Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ | 32 | Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ |