diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 14:36:22 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 15:32:53 +0200 |
commit | f4cf9fe05bb3f32fabea4e54dd92d368967a80da (patch) | |
tree | 487180fa9866985ea7b28e625651765d86f515c3 /meta/recipes-support/curl/curl | |
download | poky-f4cf9fe05bb3f32fabea4e54dd92d368967a80da.tar.gz |
initial commit for Enea Linux 4.0
Migrated from the internal git server on the daisy-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-support/curl/curl')
-rw-r--r-- | meta/recipes-support/curl/curl/configure_ac.patch | 13 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl/pkgconfig_fix.patch | 32 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl/configure_ac.patch b/meta/recipes-support/curl/curl/configure_ac.patch new file mode 100644 index 0000000000..b8bd304d71 --- /dev/null +++ b/meta/recipes-support/curl/curl/configure_ac.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- a/configure.ac | ||
4 | +++ b/configure.ac | ||
5 | @@ -281,7 +281,7 @@ dnl ************************************ | ||
6 | |||
7 | CURL_CHECK_COMPILER | ||
8 | CURL_SET_COMPILER_BASIC_OPTS | ||
9 | -CURL_SET_COMPILER_DEBUG_OPTS | ||
10 | +dnl CURL_SET_COMPILER_DEBUG_OPTS | ||
11 | CURL_SET_COMPILER_OPTIMIZE_OPTS | ||
12 | CURL_SET_COMPILER_WARNING_OPTS | ||
13 | |||
diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch new file mode 100644 index 0000000000..5d8769d522 --- /dev/null +++ b/meta/recipes-support/curl/curl/pkgconfig_fix.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Upstream-Status: Inappropriate [packaging] | ||
2 | |||
3 | diff -Nurd curl-7.29.0/configure.ac curl-7.29.0/configure.ac | ||
4 | --- curl-7.29.0/configure.ac 2013-02-06 11:47:19.000000000 +0200 | ||
5 | +++ curl-7.29.0/configure.ac 2013-02-16 12:32:22.132327764 +0200 | ||
6 | @@ -1883,6 +1883,7 @@ | ||
7 | AC_SUBST(USE_GNUTLS, [1]) | ||
8 | GNUTLS_ENABLED=1 | ||
9 | USE_GNUTLS="yes" | ||
10 | + GNUTLS_REQUIRED="gnutls" | ||
11 | curl_ssl_msg="enabled (GnuTLS)" | ||
12 | ], | ||
13 | [ | ||
14 | @@ -1953,6 +1954,8 @@ | ||
15 | ]) | ||
16 | fi | ||
17 | |||
18 | +AC_SUBST(GNUTLS_REQUIRED) | ||
19 | + | ||
20 | dnl ---------------------------------------------------- | ||
21 | dnl check for PolarSSL | ||
22 | dnl ---------------------------------------------------- | ||
23 | diff -Nurd curl-7.29.0/libcurl.pc.in curl-7.29.0/libcurl.pc.in | ||
24 | --- curl-7.29.0/libcurl.pc.in 2012-12-12 00:32:22.000000000 +0200 | ||
25 | +++ curl-7.29.0/libcurl.pc.in 2013-02-16 12:33:27.063844337 +0200 | ||
26 | @@ -35,5 +35,5 @@ | ||
27 | Description: Library to transfer files with ftp, http, etc. | ||
28 | Version: @CURLVERSION@ | ||
29 | Libs: -L${libdir} -lcurl | ||
30 | -Libs.private: @LIBCURL_LIBS@ | ||
31 | +Libs.private: -ldl -lz | ||
32 | Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ | ||