From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Date: Wed, 5 Feb 2014 13:49:57 +0100 Subject: [Buildroot] [PATCH 4 of 7] packages: remove support for documentation on target In-Reply-To: References: Message-ID: <20140205134957.463211f6@skate> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Dear Thomas De Schampheleire, On Wed, 05 Feb 2014 11:50:10 +0100, Thomas De Schampheleire wrote: > diff --git a/package/Makefile.in b/package/Makefile.in > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -332,7 +332,6 @@ ifneq ($(BR2_LARGEFILE),y) > DISABLE_LARGEFILE= --disable-largefile > endif > > -ifneq ($(BR2_HAVE_DOCUMENTATION),y) > # The configure option varies, but since unknown options are ignored > # we can pass all of them. > DISABLE_DOCUMENTATION = \ > @@ -342,7 +341,6 @@ DISABLE_DOCUMENTATION = \ > --disable-documentation \ > --with-xmlto=no \ > --with-fop=no > -endif So the DISABLE_DOCUMENTATION variable now always has the same value, and is only used in pkg-autotools.mk in one place. So I believe it makes sense to remove this variable altogether, and simply pass all the appropriate -- options directly in the _CONFIGURE_CMDS of pkg-autotools.mk. > diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk > --- a/package/kmod/kmod.mk > +++ b/package/kmod/kmod.mk > @@ -19,12 +19,9 @@ KMOD_LICENSE_FILES = libkmod/COPYING > # https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=b7016153ec8 > KMOD_CONF_OPT = --disable-static --enable-shared > > -# manpages not installed to host and needs xsltproc > +# manpages not installed and needs xsltproc > HOST_KMOD_CONF_OPT = --disable-manpages > - > -ifneq ($(BR2_HAVE_DOCUMENTATION),y) > KMOD_CONF_OPT += --disable-manpages > -endif Then merge this KMOD_CONF_OPT += line with the existing KMOD_CONF_OPT line above. > diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk > --- a/package/netsnmp/netsnmp.mk > +++ b/package/netsnmp/netsnmp.mk > @@ -44,9 +44,7 @@ else > endif > > # Docs > -ifneq ($(BR2_HAVE_DOCUMENTATION),y) > - NETSNMP_CONF_OPT += --disable-manuals > -endif > +NETSNMP_CONF_OPT += --disable-manuals Ditto here. Now that it is no longer conditional, you can add --disable-manuals to the already existing NETSNMP_CONF_OPT unconditional definition. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com