[OE-core] [PATCH 1/1] curl: Backport a fix for a build issue

[Otavio Salvador]

Hello Tudor,

On Fri, May 2, 2014 at 7:21 PM, Tudor Florea <tudor.florea at enea.com> wrote:
> 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.
>
> Signed-off-by: Tudor Florea <tudor.florea at enea.com>

Thanks for looking at this. Comments below...

>  .../curl/generate_code_for_disable_manual.patch    |   38 ++++++++++++++++++++
>  meta/recipes-support/curl/curl_7.36.0.bb           |    1 +
>  2 files changed, 39 insertions(+)
>  create mode 100644 meta/recipes-support/curl/curl/generate_code_for_disable_manual.patch
>
> 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 0000000..dc755e4
> --- /dev/null
> +++ b/meta/recipes-support/curl/curl/generate_code_for_disable_manual.patch
> @@ -0,0 +1,38 @@
> +Upsteam-Status Backport [fixed in 7.37.0]
> +commit 38d582ff541353d738858299d4a2b78bafac03ed
> +Author: Daniel Stenberg <daniel at 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

Upstream-Status please.

...
> diff --git a/meta/recipes-support/curl/curl_7.36.0.bb b/meta/recipes-support/curl/curl_7.36.0.bb
> index 6f55463..bd7191d 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"
>
>  SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
>             file://pkgconfig_fix.patch \
> +           file://generate_code_for_disable_manual.patch \
>  "
>
>  # curl likes to set -g0 in CFLAGS, so we stop it

The manual detection is floating as it was reproduced in our builder
and worked for you initially. Please pass --disable-manual explicitly.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750