diff options
author | Marko Lindqvist <cazfi74@gmail.com> | 2012-12-26 03:10:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-31 09:43:26 +0000 |
commit | 1cfb12babc308157f900135ef2be8bb7c74c58b8 (patch) | |
tree | d9fd7c0b34e1c940ebf7709f990f329c3021c872 /meta/recipes-support/curl/curl | |
parent | b7515e25bfaa45c931a512d4850b75125fc18a68 (diff) | |
download | poky-1cfb12babc308157f900135ef2be8bb7c74c58b8.tar.gz |
curl: update to upstream version 7.28.1
(From OE-Core rev: 2cb1285195439faa48571acc5346d25b4de214b4)
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 | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch index ad73c00885..7f4ef7daf6 100644 --- a/meta/recipes-support/curl/curl/pkgconfig_fix.patch +++ b/meta/recipes-support/curl/curl/pkgconfig_fix.patch | |||
@@ -1,25 +1,9 @@ | |||
1 | Upstream-Status: Inappropriate [packaging] | 1 | Upstream-Status: Inappropriate [packaging] |
2 | 2 | ||
3 | 3 | diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac | |
4 | Index: curl-7.20.0/libcurl.pc.in | 4 | --- curl-7.28.1/configure.ac 2012-09-08 23:39:18.000000000 +0300 |
5 | =================================================================== | 5 | +++ curl-7.28.1/configure.ac 2012-12-25 03:41:29.948026351 +0200 |
6 | --- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000 | 6 | @@ -1863,6 +1863,7 @@ |
7 | +++ curl-7.20.0/libcurl.pc.in 2010-03-25 12:13:26.814051066 +0000 | ||
8 | @@ -35,6 +35,7 @@ | ||
9 | URL: http://curl.haxx.se/ | ||
10 | Description: Library to transfer files with ftp, http, etc. | ||
11 | Version: @CURLVERSION@ | ||
12 | -Libs: -L${libdir} -lcurl @LIBS@ | ||
13 | -Libs.private: @LIBCURL_LIBS@ @LIBS@ | ||
14 | +Requires.private: @GNUTLS_REQUIRED@ | ||
15 | +Libs: -L${libdir} -lcurl | ||
16 | +Libs.private: -ldl -lz | ||
17 | Cflags: -I${includedir} | ||
18 | Index: curl-7.20.0/configure.ac | ||
19 | =================================================================== | ||
20 | --- curl-7.20.0.orig/configure.ac 2010-02-04 21:41:46.000000000 +0000 | ||
21 | +++ curl-7.20.0/configure.ac 2010-03-25 12:12:18.673129001 +0000 | ||
22 | @@ -1668,6 +1668,7 @@ | ||
23 | AC_SUBST(USE_GNUTLS, [1]) | 7 | AC_SUBST(USE_GNUTLS, [1]) |
24 | GNUTLS_ENABLED=1 | 8 | GNUTLS_ENABLED=1 |
25 | USE_GNUTLS="yes" | 9 | USE_GNUTLS="yes" |
@@ -27,12 +11,25 @@ Index: curl-7.20.0/configure.ac | |||
27 | curl_ssl_msg="enabled (GnuTLS)" | 11 | curl_ssl_msg="enabled (GnuTLS)" |
28 | ], | 12 | ], |
29 | [ | 13 | [ |
30 | @@ -1696,6 +1697,8 @@ | 14 | @@ -1933,6 +1934,8 @@ |
31 | 15 | ]) | |
32 | fi dnl OPENSSL != 1 | 16 | fi |
33 | 17 | ||
34 | +AC_SUBST(GNUTLS_REQUIRED) | 18 | +AC_SUBST(GNUTLS_REQUIRED) |
35 | + | 19 | + |
36 | dnl ---------------------------------------------------- | 20 | dnl ---------------------------------------------------- |
37 | dnl NSS. Only check if GnuTLS and OpenSSL are not enabled | 21 | dnl check for PolarSSL |
38 | dnl ---------------------------------------------------- | 22 | dnl ---------------------------------------------------- |
23 | diff -Nurd curl-7.28.1/libcurl.pc.in curl-7.28.1/libcurl.pc.in | ||
24 | --- curl-7.28.1/libcurl.pc.in 2012-08-08 23:45:18.000000000 +0300 | ||
25 | +++ curl-7.28.1/libcurl.pc.in 2012-12-25 03:43:23.564023858 +0200 | ||
26 | @@ -34,6 +34,7 @@ | ||
27 | URL: http://curl.haxx.se/ | ||
28 | Description: Library to transfer files with ftp, http, etc. | ||
29 | Version: @CURLVERSION@ | ||
30 | -Libs: -L${libdir} -lcurl @LIBS@ | ||
31 | -Libs.private: @LIBCURL_LIBS@ @LIBS@ | ||
32 | +Requires.private: @GNUTLS_REQUIRED@ | ||
33 | +Libs: -L${libdir} -lcurl | ||
34 | +Libs.private: -ldl -lz | ||
35 | Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ | ||