[Buildroot] [git commit] xlib_libSM: only build documentation if needed

[Buildroot] [git commit] xlib_libSM: only build documentation if needed

[Peter Korsgaard]

commit: http://git.buildroot.net/buildroot/commit/?id=812eae5ccf281f89efba6092cb432224c0f7e89c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Documentation generation is slow, so only create it if requested.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/x11r7/xlib_libSM/xlib_libSM.mk |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index a8d1eff..bdbda3f 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -11,4 +11,9 @@ XLIB_LIBSM_INSTALL_STAGING = YES
 XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
 XLIB_LIBSM_CONF_OPT = --without-libuuid
 
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+# documentation generation is slow
+XLIB_LIBSM_CONF_OPT += --disable-docs
+endif
+
 $(eval $(autotools-package))

[Buildroot] [git commit] xlib_libSM: only build documentation if needed

[Arnout Vandecappelle]

On 26/09/12 22:51, Peter Korsgaard wrote:
> commit: http://git.buildroot.net/buildroot/commit/?id=812eae5ccf281f89efba6092cb432224c0f7e89c
> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> Documentation generation is slow, so only create it if requested.
>
> Signed-off-by: Peter Korsgaard<jacmet@sunsite.dk>
> ---
>   package/x11r7/xlib_libSM/xlib_libSM.mk |    5 +++++
>   1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
> index a8d1eff..bdbda3f 100644
> --- a/package/x11r7/xlib_libSM/xlib_libSM.mk
> +++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
> @@ -11,4 +11,9 @@ XLIB_LIBSM_INSTALL_STAGING = YES
>   XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
>   XLIB_LIBSM_CONF_OPT = --without-libuuid
>
> +ifneq ($(BR2_HAVE_DOCUMENTATION),y)
> +# documentation generation is slow
> +XLIB_LIBSM_CONF_OPT += --disable-docs
> +endif
>

Roughly 45 packages have some form of --disable-doc, with variants

--disable-doc
--disable-docs
--disable-documentation

Maybe we should just add all three to the common configure options?

Regards,
Arnout

-- 
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [git commit] xlib_libSM: only build documentation if needed

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

Hi,

 Arnout> Roughly 45 packages have some form of --disable-doc, with variants

 Arnout> --disable-doc
 Arnout> --disable-docs
 Arnout> --disable-documentation

 Arnout> Maybe we should just add all three to the common configure options?

Yes, that imho makes sense. For some packages, the documentation
generation step is a significant part of the build time.

Care to submit a patch?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH] pkg-infra: pass --disable-doc if documentation is not enabled

[Arnout Vandecappelle]

Many configure scripts support an option like --disable-doc, --disable-docs
or --disable-documentation.  Pass all of these to configure.

In addition, not all Xorg packages accept the --disable-xxx. Instead they
look for xmlto and/or fop and build documentation if they exist.  For host
packages, this may lead to build errors because /usr/bin/xmlto uses libxml2
and we set LD_LIBRARY_PATH to point to $(HOST_DIR)/lib, which may contain
a libxml2 as well.  So it's essential to disable xmlto for host packages.

Also some whitespace cleanup.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
This obviously has far-ranging effects and I didn't rebuild all packages.
However, from inspecting the configure scripts of all packages, it looks
like --with-xmlto and --with-fop are only used for generating documentation.

 package/Makefile.in      |   10 +++++++++-
 package/pkg-autotools.mk |    9 +++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index a939882..d7c73e5 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -277,7 +277,15 @@ DISABLE_LARGEFILE= --disable-largefile
 endif
 
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-DISABLE_DOCUMENTATION=--disable-gtk-doc
+# The configure option varies, but since unknown options are ignored
+# we can pass all of them.
+DISABLE_DOCUMENTATION = \
+	--disable-gtk-doc \
+	--disable-doc \
+	--disable-docs \
+	--disable-documentation \
+	--with-xmlto=no \
+	--with-fop=no
 endif
 
 ifeq ($(BR2_INET_IPV6),y)
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 785daab..890506b 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -116,6 +116,9 @@ endef
 else
 
 # Configure package for host
+# disable all kind of documentation generation in the process,
+# because it often relies on host tools which may or may not be
+# installed.
 define $(2)_CONFIGURE_CMDS
 	(cd $$($$(PKG)_SRCDIR) && rm -rf config.cache; \
 	        $$(HOST_CONFIGURE_OPTS) \
@@ -126,6 +129,12 @@ define $(2)_CONFIGURE_CMDS
 		--prefix="$$(HOST_DIR)/usr" \
 		--sysconfdir="$$(HOST_DIR)/etc" \
 		--enable-shared --disable-static \
+		--disable-gtk-doc \
+		--disable-doc \
+		--disable-docs \
+		--disable-documentation \
+		--with-xmlto=no \
+		--with-fop=no \
 		$$($$(PKG)_CONF_OPT) \
 	)
 endef
-- 
tg: (9de85f7..) t/disable-doc (depends on: master)