Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] libcurl: fix building against libressl
Date: Sun, 15 Apr 2018 20:43:27 +0200	[thread overview]
Message-ID: <20180415204327.5bc05597@windsurf.numericable.fr> (raw)
In-Reply-To: <20180413123931.7604-1-aduskett@gmail.com>

Hello,

On Fri, 13 Apr 2018 08:39:31 -0400, Adam Duskett wrote:
> LibreSSL 2.7.x breaks libcurl 7.59.0 with the error:
> error: static declaration of ?OpenSSL_version_num? follows non-static
> declaration
> 
> This failure has since been fixed upstream with commit:
> https://github.com/curl/curl/commit/7c90c93c0b061da81f69fabdd57125b2783c15fb
> 
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
>  ...-curl-fix-building-against-libressl-2.7.2.patch | 91 ++++++++++++++++++++++
>  1 file changed, 91 insertions(+)
>  create mode 100644 package/libcurl/0001-curl-fix-building-against-libressl-2.7.2.patch
> 
> diff --git a/package/libcurl/0001-curl-fix-building-against-libressl-2.7.2.patch b/package/libcurl/0001-curl-fix-building-against-libressl-2.7.2.patch
> new file mode 100644
> index 0000000000..e5d6f686e8
> --- /dev/null
> +++ b/package/libcurl/0001-curl-fix-building-against-libressl-2.7.2.patch
> @@ -0,0 +1,91 @@
> +From 7a67b6561da8e42505e09014a5c97b19e1a93532 Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <aduskett@gmail.com>
> +Date: Fri, 13 Apr 2018 08:31:37 -0400
> +Subject: [PATCH] curl: fix building against libressl 2.7.2

Since the issue has been fixed upstream, the fix should be a backport
from upstream commit, not a different commit authored by you.

I.e:

$ git clone https://github.com/curl/curl.git
$ cd curl/
$ git checkout curl-7_59_0
$ git cherry-pick 7c90c93c0b061da81f69fabdd57125b2783c15fb
$ git format-patch HEAD^

and then edit the patch to add your Signed-off-by below the one from
the original author, and use that in package/libcurl/.

Could you rework your patch by doing this ? I could have done it
myself, but I preferred to explain the process for doing it properly :)

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

  reply	other threads:[~2018-04-15 18:43 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-13 12:39 [Buildroot] [PATCH 1/1] libcurl: fix building against libressl Adam Duskett
2018-04-15 18:43 ` Thomas Petazzoni [this message]
2018-04-17 11:41   ` Arnout Vandecappelle
2018-04-17 12:36     ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180415204327.5bc05597@windsurf.numericable.fr \
    --to=thomas.petazzoni@bootlin.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox