diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-08-26 18:37:53 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-05 13:30:51 +0200 |
commit | f119c2a2f955b2eaa9ac5fca3ecac695acc096fc (patch) | |
tree | 80f7cbddff79ce8bcea50a6bd73e457abff7da4d | |
parent | 13b511cd526addc5fde68c9ebf302e3674f0d73a (diff) | |
download | meta-openembedded-f119c2a2f955b2eaa9ac5fca3ecac695acc096fc.tar.gz |
gtk-doc: disable where necessary
Several recipes in meta-oe layers are so old that they don't work
with modern gtk-doc (which was added and enabled by default in oe-core);
disable that where it is necessary for the build to succeed.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9 files changed, 13 insertions, 5 deletions
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb index a5664b085..c31de0ca1 100644 --- a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb | |||
@@ -48,7 +48,7 @@ do_compile_prepend() { | |||
48 | 48 | ||
49 | EXTRA_OECONF = "--without-openldap \ | 49 | EXTRA_OECONF = "--without-openldap \ |
50 | --with-libdb=${STAGING_DIR_HOST}${prefix} \ | 50 | --with-libdb=${STAGING_DIR_HOST}${prefix} \ |
51 | --disable-nntp --disable-goa --disable-weather" | 51 | --disable-nntp --disable-goa --disable-weather --disable-gtk-doc" |
52 | 52 | ||
53 | PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ | 53 | PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ |
54 | libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ | 54 | libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ |
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 2a6f04b4d..6ec6d4618 100644 --- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb +++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb | |||
@@ -21,7 +21,7 @@ do_compile_prepend() { | |||
21 | export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" | 21 | export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" |
22 | } | 22 | } |
23 | 23 | ||
24 | EXTRA_OECONF += "--disable-goa --disable-tests" | 24 | EXTRA_OECONF += "--disable-goa --disable-tests --disable-gtk-doc" |
25 | 25 | ||
26 | SRC_URI[archive.md5sum] = "eb552a8a8482e4231a3d1baf7262e64d" | 26 | SRC_URI[archive.md5sum] = "eb552a8a8482e4231a3d1baf7262e64d" |
27 | SRC_URI[archive.sha256sum] = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827" | 27 | SRC_URI[archive.sha256sum] = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827" |
diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb index 88f69ff8d..87a3ed0de 100644 --- a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb +++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb | |||
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868 | |||
17 | 17 | ||
18 | GPE_TARBALL_SUFFIX = "bz2" | 18 | GPE_TARBALL_SUFFIX = "bz2" |
19 | 19 | ||
20 | EXTRA_OECONF = "--enable-cairo" | 20 | EXTRA_OECONF = "--enable-cairo --disable-gtk-doc" |
21 | LDFLAGS += " -L${STAGING_LIBDIR}" | 21 | LDFLAGS += " -L${STAGING_LIBDIR}" |
22 | 22 | ||
23 | PACKAGES =+ "${PN}-bin" | 23 | PACKAGES =+ "${PN}-bin" |
diff --git a/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb b/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb index eb45974b1..ae95d4f69 100644 --- a/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb +++ b/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb | |||
@@ -2,3 +2,5 @@ require libmediaart.inc | |||
2 | 2 | ||
3 | SRC_URI[archive.md5sum] = "1a44933d4cd0064e3c76d8d0ddacddc9" | 3 | SRC_URI[archive.md5sum] = "1a44933d4cd0064e3c76d8d0ddacddc9" |
4 | SRC_URI[archive.sha256sum] = "3a9dffcad862aed7c0921579b93080d694b8a66f3676bfee8037867f653a1cd3" | 4 | SRC_URI[archive.sha256sum] = "3a9dffcad862aed7c0921579b93080d694b8a66f3676bfee8037867f653a1cd3" |
5 | |||
6 | EXTRA_OECONF_append = " --disable-gtk-doc" | ||
diff --git a/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb b/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb index 553e19c60..8cd023a50 100644 --- a/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb +++ b/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb | |||
@@ -20,7 +20,7 @@ SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environm | |||
20 | SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139" | 20 | SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139" |
21 | SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec" | 21 | SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec" |
22 | 22 | ||
23 | EXTRA_OECONF += "--without-libxml2" | 23 | EXTRA_OECONF += "--without-libxml2 --disable-gtk-doc" |
24 | 24 | ||
25 | CFLAGS += "-lz" | 25 | CFLAGS += "-lz" |
26 | 26 | ||
diff --git a/meta-oe/recipes-support/farsight/libnice_0.0.13.bb b/meta-oe/recipes-support/farsight/libnice_0.0.13.bb index 620ee1f6c..3c2a054ef 100644 --- a/meta-oe/recipes-support/farsight/libnice_0.0.13.bb +++ b/meta-oe/recipes-support/farsight/libnice_0.0.13.bb | |||
@@ -18,6 +18,8 @@ PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd" | |||
18 | 18 | ||
19 | inherit autotools pkgconfig gtk-doc | 19 | inherit autotools pkgconfig gtk-doc |
20 | 20 | ||
21 | EXTRA_OECONF = "--disable-gtk-doc" | ||
22 | |||
21 | FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" | 23 | FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" |
22 | FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la" | 24 | FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la" |
23 | FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a" | 25 | FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a" |
diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb index 34762ddc6..fbf6701ac 100644 --- a/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb | |||
@@ -17,7 +17,7 @@ inherit autotools systemd gtk-doc gobject-introspection | |||
17 | 17 | ||
18 | S = "${WORKDIR}/udisks-${PV}" | 18 | S = "${WORKDIR}/udisks-${PV}" |
19 | 19 | ||
20 | EXTRA_OECONF = "--disable-man" | 20 | EXTRA_OECONF = "--disable-man --disable-gtk-doc" |
21 | 21 | ||
22 | FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ | 22 | FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ |
23 | ${datadir}/dbus-1/ \ | 23 | ${datadir}/dbus-1/ \ |
diff --git a/meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb b/meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb index f27396c00..824611abe 100644 --- a/meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb +++ b/meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb | |||
@@ -24,6 +24,8 @@ SRC_URI[sha256sum] = "4b216f5200490f8d2a9bf1b3fcd9a8b20834c95249bf13b9170c82e1fc | |||
24 | 24 | ||
25 | RDEPENDS_${PN} += "gstreamer1.0-plugins-good" | 25 | RDEPENDS_${PN} += "gstreamer1.0-plugins-good" |
26 | 26 | ||
27 | EXTRA_OECONF = "--disable-gtk-doc" | ||
28 | |||
27 | PACKAGECONFIG ??= "notify" | 29 | PACKAGECONFIG ??= "notify" |
28 | PACKAGECONFIG[clutter] = "--enable-clutter, --disable-clutter, clutter" | 30 | PACKAGECONFIG[clutter] = "--enable-clutter, --disable-clutter, clutter" |
29 | PACKAGECONFIG[notify] = "--enable-notify-plugin, --disable-notify-plugin, libnotify" | 31 | PACKAGECONFIG[notify] = "--enable-notify-plugin, --disable-notify-plugin, libnotify" |
diff --git a/meta-xfce/recipes-xfce/garcon/garcon_0.4.0.bb b/meta-xfce/recipes-xfce/garcon/garcon_0.4.0.bb index 81f6ce169..81143b5a5 100644 --- a/meta-xfce/recipes-xfce/garcon/garcon_0.4.0.bb +++ b/meta-xfce/recipes-xfce/garcon/garcon_0.4.0.bb | |||
@@ -10,4 +10,6 @@ SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.pat | |||
10 | SRC_URI[md5sum] = "aba62b80787aac295083bf7afd419ffb" | 10 | SRC_URI[md5sum] = "aba62b80787aac295083bf7afd419ffb" |
11 | SRC_URI[sha256sum] = "787dc859713b6518992d760d4b858fb02e8a30705e6f6e871d7a14cc97bca972" | 11 | SRC_URI[sha256sum] = "787dc859713b6518992d760d4b858fb02e8a30705e6f6e871d7a14cc97bca972" |
12 | 12 | ||
13 | EXTRA_OECONF = "--disable-gtk-doc" | ||
14 | |||
13 | FILES_${PN} += "${datadir}/desktop-directories" | 15 | FILES_${PN} += "${datadir}/desktop-directories" |