summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-06-24 17:13:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-25 13:51:46 +0100
commit6e392abb99ed2fcb1457541df58dffc5263b4615 (patch)
tree02b9998970025abed5c283fe538b6aa2642ba122
parentee140962f3fdd0cb2ac9c37eac017148f61fd0b0 (diff)
downloadpoky-6e392abb99ed2fcb1457541df58dffc5263b4615.tar.gz
curl: Update to 7.37
Remove patches that are fixed upstream (From OE-Core rev: d5d169af2b34596deb3997c2bfa7398c447c4fac) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/curl/curl/generate_code_for_disable_manual.patch38
-rw-r--r--meta/recipes-support/curl/curl_7.37.0.bb (renamed from meta/recipes-support/curl/curl_7.36.0.bb)6
2 files changed, 2 insertions, 42 deletions
diff --git a/meta/recipes-support/curl/curl/generate_code_for_disable_manual.patch b/meta/recipes-support/curl/curl/generate_code_for_disable_manual.patch
deleted file mode 100644
index dc755e44ad..0000000000
--- a/meta/recipes-support/curl/curl/generate_code_for_disable_manual.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Upsteam-Status Backport [fixed in 7.37.0]
2commit 38d582ff541353d738858299d4a2b78bafac03ed
3Author: Daniel Stenberg <daniel@haxx.se>
4Date: Wed Mar 26 13:22:10 2014 +0100
5
6 mkhelp: generate code for --disable-manual as well
7
8 This allows configure --disable-manual to run and build without having
9 to regenerate the src/tool_hugehelp.c file which otherwise is necessary
10 since we ship tarballs with that file present.
11
12 Reported-by: Remi Gacogne
13 Bug: http://curl.haxx.se/bug/view.cgi?id=1350
14
15diff --git a/src/mkhelp.pl b/src/mkhelp.pl
16index 444b669..7ed86f7 100644
17--- a/src/mkhelp.pl
18+++ b/src/mkhelp.pl
19@@ -6,7 +6,7 @@
20 # | (__| |_| | _ <| |___
21 # \___|\___/|_| \_\_____|
22 #
23-# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
24+# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
25 #
26 # This software is licensed as described in the file COPYING, which
27 # you should have received as part of this distribution. The terms
28@@ -256,6 +256,10 @@ foot();
29
30 sub foot {
31 print <<FOOT
32+#else /* !USE_MANUAL */
33+/* built-in manual is disabled, blank function */
34+#include "tool_hugehelp.h"
35+void hugehelp(void) {}
36 #endif /* USE_MANUAL */
37 FOOT
38 ;
diff --git a/meta/recipes-support/curl/curl_7.36.0.bb b/meta/recipes-support/curl/curl_7.37.0.bb
index 54ea6d407f..1dc4ff3249 100644
--- a/meta/recipes-support/curl/curl_7.36.0.bb
+++ b/meta/recipes-support/curl/curl_7.37.0.bb
@@ -11,8 +11,6 @@ DEPENDS_class-nativesdk = "nativesdk-zlib"
11 11
12SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 12SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
13 file://pkgconfig_fix.patch \ 13 file://pkgconfig_fix.patch \
14 file://generate_code_for_disable_manual.patch \
15 file://remove_inappropriate_file_from_rel.patch \
16" 14"
17 15
18# curl likes to set -g0 in CFLAGS, so we stop it 16# curl likes to set -g0 in CFLAGS, so we stop it
@@ -20,8 +18,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
20# 18#
21SRC_URI += " file://configure_ac.patch" 19SRC_URI += " file://configure_ac.patch"
22 20
23SRC_URI[md5sum] = "e6d1f9d1b59da5062109ffe14e0569a4" 21SRC_URI[md5sum] = "7dda0cc2e4136f78d5801ac347be696b"
24SRC_URI[sha256sum] = "1fbe82b89bcd6b7ccda8cb0ff076edc60e911595030e27689f4abd5ef7f3cfcd" 22SRC_URI[sha256sum] = "24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239b3e09e"
25 23
26inherit autotools pkgconfig binconfig multilib_header 24inherit autotools pkgconfig binconfig multilib_header
27 25