diff mbox series

[9/9] util-linux: enable gtk-doc

Message ID 20240110130730.3698802-9-ross.burton@arm.com
State Accepted, archived
Commit 6999719143df04816c74fbc46d4a97b377bc0b36
Headers show
Series [1/9] glib-2.0: no need to depend on target gtk-doc | expand

Commit Message

Ross Burton Jan. 10, 2024, 1:07 p.m. UTC 
From: Ross Burton <ross.burton@arm.com>

Now that we've solved the util-linux - gtk-doc - xmlto - util-linux
dependency loop, we can enable gtk-doc in util-linux.

We explicitly disable it in util-linux-libuuuid as this doesn't have API
documentation.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb | 3 +++
 meta/recipes-core/util-linux/util-linux_2.39.2.bb         | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb
index 5d759aed94b..ec04c1d3843 100644
--- a/meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb
+++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.39.2.bb
@@ -6,7 +6,10 @@  require util-linux.inc
 inherit autotools gettext pkgconfig
 
 S = "${WORKDIR}/util-linux-${PV}"
+
+EXTRA_AUTORECONF += "--exclude=gtkdocize"
 EXTRA_OECONF += "--disable-all-programs --enable-libuuid"
+
 LICENSE = "BSD-3-Clause"
 
 do_install:append() {
diff --git a/meta/recipes-core/util-linux/util-linux_2.39.2.bb b/meta/recipes-core/util-linux/util-linux_2.39.2.bb
index 8c081674017..9fd3a5f5258 100644
--- a/meta/recipes-core/util-linux/util-linux_2.39.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.39.2.bb
@@ -1,7 +1,6 @@ 
 require util-linux.inc
 
-#gtk-doc is not enabled as it requires xmlto which requires util-linux
-inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest
+inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest gtk-doc
 DEPENDS = "libcap-ng ncurses virtual/crypt zlib util-linux-libuuid"
 
 PACKAGES =+ "${PN}-swaponoff"