Skip to contentSkip to conversation

libostree: add patch to fix compilation error

PATCH New Marcus Folkesson 3 participants 3 messages Dec 21, 2017 – Dec 28, 2017

lore
Share & tools
lore

Marcus Folkesson

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 ...llways-include-ostree-repo-pull-private.h.patch | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/libostree/0001-lib-pull-allways-include-ostree-repo-pull-private.h.patch
package/libostree/0001-lib-pull-allways-include-ostree-repo-pull-private.h.patch new file +37 -0
new file mode 100644
index 0000000000..8c1e149013
@@ -0,0 +1,37 @@
+From af58eb62038202eb1082a66af1be7d405c8a2de1 Mon Sep 17 00:00:00 2001
+From: Marcus Folkesson <[email protected]>
+Date: Thu, 21 Dec 2017 10:20:48 +0100
+Subject: [PATCH] lib/pull: allways include ostree-repo-pull-private.h
+
+Allways 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 <[email protected]>
+---
+ 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
+
Signature · 1 line
2.15.1
#1 lore raw

PATCH 1/1 libostree: add patch to fix compilation error

Marcus,

Quoted 11 lines · Marcus Folkesson

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 <[email protected]>
Tested-by Matt Weber <[email protected]>

I did a simple build test after applying the patch to the failing build.

Applied
#2 lore raw

PATCH 1/1 libostree: add patch to fix compilation error

In reply to Marcus Folkesson

Hello,

Quoted 7 lines · Marcus Folkesson

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.

Quoted 8 lines

Fixes:
http://autobuild.buildroot.net/results/3fc91565cb2d0fabe566c109257a616bd57cb08c

Signed-off-by Marcus Folkesson <[email protected]>
---
 ...llways-include-ostree-repo-pull-private.h.patch | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/libostree/0001-lib-pull-allways-include-ostree-repo-pull-private.h.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com