From patchwork Sun Nov 4 10:52:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: pkg-infra: pass --disable-doc if documentation is not enabled Date: Sun, 04 Nov 2012 00:52:03 -0000 From: Arnout Vandecappelle X-Patchwork-Id: 196989 Message-Id: <1352026323-17193-1-git-send-email-arnout@mind.be> To: buildroot@busybox.net 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) --- 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