summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-21 14:47:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-25 09:40:42 +0100
commited2dc5f03aa46013ae05a1802d42a3a5ec10845d (patch)
tree1ab4d355f65f03db31345633a5f8f06b77f78ad8 /meta
parentdea2b8225031f1fa0f136ddac1fb0122ab1d81ba (diff)
downloadpoky-ed2dc5f03aa46013ae05a1802d42a3a5ec10845d.tar.gz
gtk-doc: don't regenerate gtk-doc in do_install
In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir. However, if some of this content is regenerated at configure time this can happen: 1) configure writes new build/version.xml 2) make compile copies content, including the tarball's src/version.xml to build/version.xml, and generates gtk-doc. 3) make install notices build/version.xml is older than configure.status, so regenerates gtk-doc. gtk-doc generation is a slow process at the best of times, so doing it twice isn't good. (From OE-Core rev: 9ea9d61f26a942dbbc90070b40ba0209021a4b46) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gtk-doc/files/no-clobber.patch27
-rw-r--r--meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
new file mode 100644
index 0000000000..0fa22b2097
--- /dev/null
+++ b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
@@ -0,0 +1,27 @@
1In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir.
2
3However, if some of this content is regenerated at configure time this can happen:
4
51) configure writes new build/version.xml
62) make compile copies content, including the tarball's src/version.xml
7 to build/version.xml, and generates gtk-doc.
83) make install notices build/version.xml is older than configure.status,
9 so regenerates gtk-doc.
10
11gtk-doc generation is a slow process at the best of times, so doing it twice isn't good.
12
13Solve this by changing cp --force to cp --no-clobber, so setup-build only copies
14files which don't already exist.
15
16Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571]
17Signed-off-by: Ross Burton <ross.burton@intel.com>
18
19diff --git a/gtk-doc.make b/gtk-doc.make
20index f87eaab..246f3c0 100644
21--- a/gtk-doc.make
22+++ b/gtk-doc.make
23@@ -113,3 +113,3 @@ setup-build.stamp:
24 test -f $(abs_srcdir)/$$file && \
25- cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
26+ cp -pn $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
27 done; \
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
index b907bae147..45528111c1 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
@@ -23,6 +23,7 @@ SRC_URI[archive.sha256sum] = "e26bd3f7080c749b1cb66c46c6bf8239e2f320a949964fb9c6
23SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ 23SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
24 file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ 24 file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
25 file://conditionaltests.patch \ 25 file://conditionaltests.patch \
26 file://no-clobber.patch \
26 " 27 "
27SRC_URI_append_class-native = " file://pkg-config-native.patch" 28SRC_URI_append_class-native = " file://pkg-config-native.patch"
28 29