diff options
| -rw-r--r-- | main/curl/0001-mkhelp-generate-code-for-disable-manual-as-well.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/main/curl/0001-mkhelp-generate-code-for-disable-manual-as-well.patch b/main/curl/0001-mkhelp-generate-code-for-disable-manual-as-well.patch new file mode 100644 index 0000000000..d23b484d3e --- /dev/null +++ b/main/curl/0001-mkhelp-generate-code-for-disable-manual-as-well.patch @@ -0,0 +1,42 @@ +From 38d582ff541353d738858299d4a2b78bafac03ed Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Wed, 26 Mar 2014 13:22:10 +0100 +Subject: [PATCH] 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 +--- + src/mkhelp.pl | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +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 + ; +-- +1.9.1 + |