mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtk-doc: don't regenerate gtk-doc in do_install

Browse Source 
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>
This commit is contained in:
Ross Burton
2018-03-21 14:47:29 +00:00
committed by Richard Purdie
parent dea2b82250
commit ed2dc5f03a
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/recipes-gnome/gtk-doc/files/no-clobber.patch Normal file
View File

@@ -0,0 +1,27 @@
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.
Solve this by changing cp --force to cp --no-clobber, so setup-build only copies
files which don't already exist.
Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571]
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/gtk-doc.make b/gtk-doc.make
index f87eaab..246f3c0 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -113,3 +113,3 @@ setup-build.stamp:
test -f $(abs_srcdir)/$$file && \
- cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+ cp -pn $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
done; \

1
meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
View File

@@ -23,6 +23,7 @@ SRC_URI[archive.sha256sum] = "e26bd3f7080c749b1cb66c46c6bf8239e2f320a949964fb9c6
SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
file://conditionaltests.patch \
file://no-clobber.patch \
"
SRC_URI_append_class-native = " file://pkg-config-native.patch"