summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2014-05-03 00:21:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-03 11:26:01 +0100
commit530e66cb04508e361643609496da8b2b4f75e3bf (patch)
tree140ab72605ebd589a301129b37edeaf70fff3637 /meta/recipes-support/curl
parent0304d92a9727ec9f8ea30f0cacaa29a66683bdab (diff)
downloadpoky-530e66cb04508e361643609496da8b2b4f75e3bf.tar.gz
curl: Backport a fix for a build issue
mkhelp: generate code for --disable-manual as well This allows configure --disable-manual to run and build without having to regenerate the src/tool_hugehelp.c file which otherwise is necessary since we ship tarballs with that file present. (From OE-Core rev: 544a96255203a6779d1f0022d003c6680f330511) Signed-off-by: Tudor Florea <tudor.florea@enea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl')
-rw-r--r--meta/recipes-support/curl/curl/generate_code_for_disable_manual.patch38
-rw-r--r--meta/recipes-support/curl/curl_7.36.0.bb1
2 files changed, 39 insertions, 0 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
new file mode 100644
index 0000000000..dc755e44ad
--- /dev/null
+++ b/meta/recipes-support/curl/curl/generate_code_for_disable_manual.patch
@@ -0,0 +1,38 @@
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.36.0.bb
index 6f5546321a..bd7191d284 100644
--- a/meta/recipes-support/curl/curl_7.36.0.bb
+++ b/meta/recipes-support/curl/curl_7.36.0.bb
@@ -11,6 +11,7 @@ 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 \
14" 15"
15 16
16# curl likes to set -g0 in CFLAGS, so we stop it 17# curl likes to set -g0 in CFLAGS, so we stop it