Patchwork glib: Add --disable-man to configure arguments

login
register
mail settings
Submitter Phil Blundell
Date April 25, 2013, 2:34 p.m.
Message ID <1366900461.14512.92.camel@phil-desktop.brightsign>
Download mbox | patch
Permalink /patch/48895/
State Accepted
Commit c67cdf51b106984e839f4b8a93a34f55bbcf3a00
Headers show

Comments

Phil Blundell - April 25, 2013, 2:34 p.m.
Without this, glib will probe for the existence of xsltproc and use that
to decide whether or not it wants to generate manpages.  This has two
consequences, neither of them good:

a) the result of the build will vary depending on whether xsltproc
happens to be installed in either the native sysroot or the host
environment; and

b) if xsltproc does happen to be installed but docbook-xsl isn't, the
build will fail with "I/O error" messages.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-core/glib-2.0/glib.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Colin Walters - April 25, 2013, 5:20 p.m.
On Thu, 2013-04-25 at 15:34 +0100, Phil Blundell wrote:

> -CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap"
> +CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
>  
>  PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-modular-tests', '--disable-modular-tests', d)}"
>  EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"

Looks good.

Signed-off-by: Colin Walters <walters@verbum.org>

Patch

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 42c34c3..d5fa0a3 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -25,7 +25,7 @@  inherit autotools gettext gtk-doc pkgconfig ptest
 
 S = "${WORKDIR}/glib-${PV}"
 
-CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap"
+CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
 
 PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-modular-tests', '--disable-modular-tests', d)}"
 EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"