diff options
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/curl/curl/pkgconfig_fix.patch | 20 | ||||
-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 @@ | |||
1 | Index: curl-7.16.4/libcurl.pc.in | 1 | Index: curl-7.20.0/libcurl.pc.in |
2 | =================================================================== | 2 | =================================================================== |
3 | --- curl-7.16.4.orig/libcurl.pc.in 2007-02-18 09:41:27.000000000 +0000 | 3 | --- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000 |
4 | +++ curl-7.16.4/libcurl.pc.in 2008-03-18 11:42:43.000000000 +0000 | 4 | +++ curl-7.20.0/libcurl.pc.in 2010-03-25 12:13:26.814051066 +0000 |
5 | @@ -33,6 +33,7 @@ | 5 | @@ -35,6 +35,7 @@ |
6 | URL: http://curl.haxx.se/ | 6 | URL: http://curl.haxx.se/ |
7 | Description: Library to transfer files with ftp, http, etc. | 7 | Description: Library to transfer files with ftp, http, etc. |
8 | Version: @VERSION@ | 8 | Version: @VERSION@ |
9 | -Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@ | 9 | -Libs: -L${libdir} -lcurl @LIBS@ |
10 | -Libs.private: @LIBCURL_LIBS@ @LIBS@ | 10 | -Libs.private: @LIBCURL_LIBS@ @LIBS@ |
11 | +Requires.private: @GNUTLS_REQUIRED@ | 11 | +Requires.private: @GNUTLS_REQUIRED@ |
12 | +Libs: -L${libdir} -lcurl | 12 | +Libs: -L${libdir} -lcurl |
13 | +Libs.private: -ldl -lz | 13 | +Libs.private: -ldl -lz |
14 | Cflags: -I${includedir} | 14 | Cflags: -I${includedir} |
15 | Index: curl-7.16.4/configure.ac | 15 | Index: curl-7.20.0/configure.ac |
16 | =================================================================== | 16 | =================================================================== |
17 | --- curl-7.16.4.orig/configure.ac 2008-03-18 11:40:30.000000000 +0000 | 17 | --- curl-7.20.0.orig/configure.ac 2010-02-04 21:41:46.000000000 +0000 |
18 | +++ curl-7.16.4/configure.ac 2008-03-18 11:42:06.000000000 +0000 | 18 | +++ curl-7.20.0/configure.ac 2010-03-25 12:12:18.673129001 +0000 |
19 | @@ -1361,6 +1361,7 @@ | 19 | @@ -1668,6 +1668,7 @@ |
20 | AC_SUBST(USE_GNUTLS, [1]) | 20 | AC_SUBST(USE_GNUTLS, [1]) |
21 | GNUTLS_ENABLED=1 | 21 | GNUTLS_ENABLED=1 |
22 | USE_GNUTLS="yes" | 22 | USE_GNUTLS="yes" |
@@ -24,7 +24,7 @@ Index: curl-7.16.4/configure.ac | |||
24 | curl_ssl_msg="enabled (GnuTLS)" | 24 | curl_ssl_msg="enabled (GnuTLS)" |
25 | ], | 25 | ], |
26 | [ | 26 | [ |
27 | @@ -1387,6 +1388,8 @@ | 27 | @@ -1696,6 +1697,8 @@ |
28 | 28 | ||
29 | fi dnl OPENSSL != 1 | 29 | fi dnl OPENSSL != 1 |
30 | 30 | ||
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 | |||