diff options
| author | Andrew Clemons <andrew.clemons@gmail.com> | 2017-09-25 20:24:10 +1300 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-11-04 07:17:47 +0700 |
| commit | d9cfc4663bda62d75816856221cba82f89841cce (patch) | |
| tree | 66828796dfa16e12272fccccde25bfc6639bd9ab | |
| parent | d4f9795d6142019bb3d38402c51353bc1bd327ee (diff) | |
system/sysdig: Fix building against newer libcurl.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/sysdig/d15be88ccb1b7df9a0b6db2967131521b526918b.patch | 53 | ||||
| -rw-r--r-- | system/sysdig/sysdig.SlackBuild | 1 |
2 files changed, 54 insertions, 0 deletions
diff --git a/system/sysdig/d15be88ccb1b7df9a0b6db2967131521b526918b.patch b/system/sysdig/d15be88ccb1b7df9a0b6db2967131521b526918b.patch new file mode 100644 index 000000000000..465be572b1fe --- /dev/null +++ b/system/sysdig/d15be88ccb1b7df9a0b6db2967131521b526918b.patch @@ -0,0 +1,53 @@ +From d15be88ccb1b7df9a0b6db2967131521b526918b 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 f7937b681..2e4449ad9 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 18ac9f5b5..c6bfb5810 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 5d00f18f2..76a18f0a8 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"/> diff --git a/system/sysdig/sysdig.SlackBuild b/system/sysdig/sysdig.SlackBuild index 6af546aa5685..d7a96998d8b1 100644 --- a/system/sysdig/sysdig.SlackBuild +++ b/system/sysdig/sysdig.SlackBuild @@ -65,6 +65,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +patch -p1 < $CWD/d15be88ccb1b7df9a0b6db2967131521b526918b.patch chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ |