diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-02-08 15:44:15 +0200 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2018-02-23 20:24:19 -0800 |
| commit | 59d22dd39f453bf6aa6109b0448979bc18c45ee9 (patch) | |
| tree | 23cf272fe244d1e0425610958671e39c2c9e5950 | |
| parent | 8f9ab712c4b4a05229e65105792c23bc96f5befe (diff) | |
| download | meta-openembedded-contrib-59d22dd39f453bf6aa6109b0448979bc18c45ee9.tar.gz | |
gtk-doc: fix build failures for libgdata and libunique
The failures appeared with recent gtk-doc 1.27 update in oe-core.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb index c2157df0cb..9b025128bf 100644 --- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb +++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb @@ -15,6 +15,10 @@ do_configure_prepend_class-target () { # introspection.m4 pre-packaged with upstream tarballs does not yet # have our fixes rm -f ${S}/introspection.m4 + + # remove the pre-built gtk-doc files, as they're installed (or attempted to be installed) + # even if gtk-doc is explicitly disabled + rm -rf ${S}/docs/reference/html } do_compile_prepend() { diff --git a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb index 9133cccb11..49ed07ad97 100644 --- a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb +++ b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb @@ -25,6 +25,6 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit autotools pkgconfig gobject-introspection distro_features_check +inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" |