summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Folkesson <marcus.folkesson@gmail.com>2017-12-22 00:19:59 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-28 22:57:32 +0100
commit2493638ff74911d187396ed9ce6137d8357c90cb (patch)
tree757392393a81262cb1a83dd10654b3a1e2ec1d7a
parentcbe63bab24b8e8d0dcc7a2bf894a3a848fc5b4df (diff)
downloadbuildroot-2493638ff74911d187396ed9ce6137d8357c90cb.tar.gz
buildroot-2493638ff74911d187396ed9ce6137d8357c90cb.zip
libostree: add patch to fix compilation error
Fix the following compilation error: src/libostree/ostree-repo-pull.c:1493:1: error: no previous prototype for '_ostree_repo_verify_bindings' [-Werror=missing-prototypes] The patch is submitted upstreams (8d3d14503b3105f93db635022e881e02688f2db4) and should be removed in the next version bump. Fixes: http://autobuild.buildroot.net/results/3fc91565cb2d0fabe566c109257a616bd57cb08c Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Tested-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libostree/0001-lib-pull-allways-include-ostree-repo-pull-private.h.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/package/libostree/0001-lib-pull-allways-include-ostree-repo-pull-private.h.patch b/package/libostree/0001-lib-pull-allways-include-ostree-repo-pull-private.h.patch
new file mode 100644
index 0000000000..3bd36d042b
--- /dev/null
+++ b/package/libostree/0001-lib-pull-allways-include-ostree-repo-pull-private.h.patch
@@ -0,0 +1,37 @@
+From af58eb62038202eb1082a66af1be7d405c8a2de1 Mon Sep 17 00:00:00 2001
+From: Marcus Folkesson <marcus.folkesson@gmail.com>
+Date: Thu, 21 Dec 2017 10:20:48 +0100
+Subject: [PATCH] lib/pull: always include ostree-repo-pull-private.h
+
+Always include ostree-repo-pull-private.h to get rid of the following
+build error when HAVE_LIBCURL_OR_LIBSOUP is not defined:
+
+src/libostree/ostree-repo-pull.c:1493:1: error: no previous prototype
+for '_ostree_repo_verify_bindings' [-Werror=missing-prototypes]
+
+Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
+---
+ src/libostree/ostree-repo-pull.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
+index 2e6e308c..b2a00ea2 100644
+--- a/src/libostree/ostree-repo-pull.c
++++ b/src/libostree/ostree-repo-pull.c
+@@ -27,12 +27,12 @@
+ #include "libglnx.h"
+ #include "ostree.h"
+ #include "otutil.h"
++#include "ostree-repo-pull-private.h"
+
+ #ifdef HAVE_LIBCURL_OR_LIBSOUP
+
+ #include "ostree-core-private.h"
+ #include "ostree-repo-private.h"
+-#include "ostree-repo-pull-private.h"
+ #include "ostree-repo-static-delta-private.h"
+ #include "ostree-metalink.h"
+ #include "ostree-fetcher-util.h"
+--
+2.15.1
+
OpenPOWER on IntegriCloud