summaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-02-02 14:34:26 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2017-03-14 18:43:18 +0000
commitaeb26bfef509e1a435a072339c4f9496b440660d (patch)
tree04f0e7ce0287873eb5f3ba51578656e3b317564a /recipes
parente40cae0619e83b9cad2c4c904992697c0eb39a40 (diff)
downloadmeta-boot2qt-aeb26bfef509e1a435a072339c4f9496b440660d.tar.gz
ostree: add patch/workaround for gtkdocize build issue
Poky 2.2 uses gtk-doc (instead of stub in previous branches). This causes build break in ostree's autogen.sh script as gtkdocize script uses wrong docdir variable. Pass docdir and srcdir variables to gtkdocize in ostree's autogen.sh. Change-Id: Ie500ad6d9b9abfd2b39829774760ec2fc5097c60 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/ostree/ostree.bb1
-rw-r--r--recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch26
2 files changed, 27 insertions, 0 deletions
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index 6a4323d..267289a 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -45,6 +45,7 @@ SRC_URI = " \
45 file://Create-firmware-convenience-symlinks.patch \ 45 file://Create-firmware-convenience-symlinks.patch \
46 file://Print-pull-progress-also-when-not-on-console.patch \ 46 file://Print-pull-progress-also-when-not-on-console.patch \
47 file://Workaround-the-SIGCHLD-handler-issue.patch \ 47 file://Workaround-the-SIGCHLD-handler-issue.patch \
48 file://workaround-gtkdocize-configure-issue-in-autog.patch \
48 " 49 "
49 50
50SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0" 51SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0"
diff --git a/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch b/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch
new file mode 100644
index 0000000..5f19007
--- /dev/null
+++ b/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch
@@ -0,0 +1,26 @@
1From 0b6711e10d36060d80962472c892c60e8a403422 Mon Sep 17 00:00:00 2001
2From: Mikko Gronoff <mikko.gronoff@qt.io>
3Date: Thu, 2 Feb 2017 13:38:54 +0200
4Subject: [PATCH] ostree: workaround gtkdocize configure issue in autogen.sh
5
6Building meta-boot2qt morty branch content with poky 2.2.1 causes
7build break in ostree autogen.sh. Called gtkdocize script uses wrong
8docdir thus causing error trying to remove gtk-doc.make in wrong
9location
10---
11 autogen.sh | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/autogen.sh b/autogen.sh
15index 0f32089..f473fdc 100755
16--- a/autogen.sh
17+++ b/autogen.sh
18@@ -25,7 +25,7 @@ EXTRA_DIST =
19 CLEANFILES =
20 EOF
21 else
22- gtkdocize
23+ gtkdocize --docdir $srcdir --srcdir $srcdir
24 fi
25
26 cd $olddir