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-11 13:38:05 -0800 |
commit | ee9af4a3fd6d2398dded07821f7e02510a823342 (patch) | |
tree | 1201e10d0adff635d0f287ad5bf563bfc914fd3b | |
parent | 7ea75fda4108006b1c896eafc8f3403ba512da6b (diff) | |
download | meta-openembedded-contrib-ee9af4a3fd6d2398dded07821f7e02510a823342.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" |