From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/sysdig: fix missing curlbuild include
Date: Fri, 1 Sep 2017 17:51:21 +0200 [thread overview]
Message-ID: <1504281081-11201-1-git-send-email-angelo.compagnucci@gmail.com> (raw)
curlbuild.h was removed in recent versions of curl, backporting a
patch from mainline to fix sysdig until a newer version is
released.
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
.../sysdig/0001-Don-t-include-curlbuild.h.patch | 56 ++++++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100644 package/sysdig/0001-Don-t-include-curlbuild.h.patch
diff --git a/package/sysdig/0001-Don-t-include-curlbuild.h.patch b/package/sysdig/0001-Don-t-include-curlbuild.h.patch
new file mode 100644
index 0000000..ae406c0
--- /dev/null
+++ b/package/sysdig/0001-Don-t-include-curlbuild.h.patch
@@ -0,0 +1,56 @@
+From 8a6670ea4b57c0e2bf8588d4534b22d1ea860989 Mon Sep 17 00:00:00 2001
+From: Mark Stemm <mark.stemm@gmail.com>
+Date: Tue, 15 Aug 2017 17:49:53 -0700
+Subject: [PATCH] Don't include curlbuild.h
+
+It's not required to build and it's not present with some newer versions
+of libcurl, so removing it.
+
+Thanks to https://github.com/hhoffstaette for the tip.
+
+This fixes https://github.com/draios/sysdig/issues/895.
+---
+ userspace/libsinsp/marathon_http.cpp | 1 -
+ userspace/libsinsp/mesos_http.cpp | 1 -
+ userspace/sysdig.project | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/userspace/libsinsp/marathon_http.cpp b/userspace/libsinsp/marathon_http.cpp
+index f7937b6..2e4449a 100644
+--- a/userspace/libsinsp/marathon_http.cpp
++++ b/userspace/libsinsp/marathon_http.cpp
+@@ -7,7 +7,6 @@
+ #include "marathon_http.h"
+ #include "curl/curl.h"
+ #include "curl/easy.h"
+-#include "curl/curlbuild.h"
+ #define BUFFERSIZE 512 // b64 needs this macro
+ #include "b64/encode.h"
+ #include "sinsp.h"
+diff --git a/userspace/libsinsp/mesos_http.cpp b/userspace/libsinsp/mesos_http.cpp
+index 18ac9f5..c6bfb58 100644
+--- a/userspace/libsinsp/mesos_http.cpp
++++ b/userspace/libsinsp/mesos_http.cpp
+@@ -7,7 +7,6 @@
+ #include "mesos_http.h"
+ #include "curl/curl.h"
+ #include "curl/easy.h"
+-#include "curl/curlbuild.h"
+ #include "sinsp.h"
+ #include "sinsp_int.h"
+ #include "sinsp_curl.h"
+diff --git a/userspace/sysdig.project b/userspace/sysdig.project
+index 5d00f18..76a18f0 100644
+--- a/userspace/sysdig.project
++++ b/userspace/sysdig.project
+@@ -752,7 +752,6 @@
+ </VirtualDirectory>
+ <VirtualDirectory Name="include">
+ <VirtualDirectory Name="curl">
+- <File Name="../build/release/curl-prefix/src/curl/include/curl/curlbuild.h"/>
+ <File Name="../build/release/curl-prefix/src/curl/include/curl/easy.h"/>
+ <File Name="../build/release/curl-prefix/src/curl/include/curl/stdcheaders.h"/>
+ <File Name="../build/release/curl-prefix/src/curl/include/curl/curlrules.h"/>
+--
+2.7.4
+
--
2.7.4
next reply other threads:[~2017-09-01 15:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-01 15:51 Angelo Compagnucci [this message]
2017-09-02 21:17 ` [Buildroot] [PATCH] package/sysdig: fix missing curlbuild include Thomas Petazzoni
[not found] ` <CA+TH9Vkr+B6-1f0QUWP98UJxbnP+c-V=htKy9byKwF8-gzzZGA@mail.gmail.com>
2017-09-03 7:16 ` 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=1504281081-11201-1-git-send-email-angelo.compagnucci@gmail.com \
--to=angelo.compagnucci@gmail.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