diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2014-06-24 17:13:15 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-25 11:49:38 +0100 |
| commit | d5d169af2b34596deb3997c2bfa7398c447c4fac (patch) | |
| tree | 7c6be5082952df9a53615e31f439f86106765841 /meta/recipes-support/curl/curl | |
| parent | ea397e7060fcb92b0b31c3de7c498c0df3f55ac4 (diff) | |
| download | openembedded-core-d5d169af2b34596deb3997c2bfa7398c447c4fac.tar.gz | |
curl: Update to 7.37
Remove patches that are fixed upstream
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/generate_code_for_disable_manual.patch | 38 |
1 files changed, 0 insertions, 38 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 @@ -Upsteam-Status Backport [fixed in 7.37.0] -commit 38d582ff541353d738858299d4a2b78bafac03ed -Author: Daniel Stenberg <daniel@haxx.se> -Date: Wed Mar 26 13:22:10 2014 +0100 - - 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. - - Reported-by: Remi Gacogne - Bug: http://curl.haxx.se/bug/view.cgi?id=1350 - -diff --git a/src/mkhelp.pl b/src/mkhelp.pl -index 444b669..7ed86f7 100644 ---- a/src/mkhelp.pl -+++ b/src/mkhelp.pl -@@ -6,7 +6,7 @@ - # | (__| |_| | _ <| |___ - # \___|\___/|_| \_\_____| - # --# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. -+# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -256,6 +256,10 @@ foot(); - - sub foot { - print <<FOOT -+#else /* !USE_MANUAL */ -+/* built-in manual is disabled, blank function */ -+#include "tool_hugehelp.h" -+void hugehelp(void) {} - #endif /* USE_MANUAL */ - FOOT - ; |