Message ID | 1392508668-27561-1-git-send-email-romain.naour@openwide.fr |
---|---|
State | Superseded |
Headers | show |
On 16/02/14 00:57, Romain Naour wrote: > There is no options to disable the documentation, > so remove it directly in Makefile.am > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> Why is this needed? Side-track: perhaps we should add stubs for makeinfo, help2man, asciidoc, xmlto, docbook2*, ... in $(HOST_DIR)/usr/bin, so we can disable all documentation in one fell swoop. Regards, Arnout
Hi Arnout, Le 17/02/2014 22:23, Arnout Vandecappelle a écrit : > On 16/02/14 00:57, Romain Naour wrote: >> There is no options to disable the documentation, >> so remove it directly in Makefile.am >> >> Signed-off-by: Romain Naour <romain.naour@openwide.fr> > Why is this needed? It is not really needed, but all documentation is installed in staging and target, which hides compilation issues because logs are not long enough in autobuilder. http://autobuild.buildroot.net/results/612/612f2b258114cbb2c60359f19a9797c5ce8852ae/build-end.log Then documentation is removed from target. > Side-track: perhaps we should add stubs for makeinfo, help2man, > asciidoc, xmlto, docbook2*, ... in $(HOST_DIR)/usr/bin, so we can disable > all documentation in one fell swoop. Yes, but in the case of Imagemagick all html stuff is not generated, it is just directly installed from the source directory. Ok, this is probably not the best method to do this... Best regards, Romain Naour
On 17/02/14 23:15, Romain Naour wrote: > Hi Arnout, > > Le 17/02/2014 22:23, Arnout Vandecappelle a écrit : >> On 16/02/14 00:57, Romain Naour wrote: >>> There is no options to disable the documentation, >>> so remove it directly in Makefile.am >>> >>> Signed-off-by: Romain Naour <romain.naour@openwide.fr> >> Why is this needed? > > It is not really needed, but all documentation is installed in staging > and target, > which hides compilation issues because logs are not long enough in > autobuilder. > > http://autobuild.buildroot.net/results/612/612f2b258114cbb2c60359f19a9797c5ce8852ae/build-end.log Hm, good point. > > > Then documentation is removed from target. > >> Side-track: perhaps we should add stubs for makeinfo, help2man, >> asciidoc, xmlto, docbook2*, ... in $(HOST_DIR)/usr/bin, so we can disable >> all documentation in one fell swoop. > Yes, but in the case of Imagemagick all html stuff is not generated, > it is just directly installed from the source directory. > > Ok, this is probably not the best method to do this... Yeah, it would be better to add a --disable-docs option to configure.ac and use that in Makefile.am. Regards, Arnout > > Best regards, > Romain Naour >
Dear Romain Naour, On Sun, 16 Feb 2014 00:57:47 +0100, Romain Naour wrote: > There is no options to disable the documentation, > so remove it directly in Makefile.am > > Signed-off-by: Romain Naour <romain.naour@openwide.fr> > --- > .../imagemagick/imagemagick-02-disable-doc.patch | 47 ++++++++++++++++++++++ > 1 file changed, 47 insertions(+) > create mode 100644 package/imagemagick/imagemagick-02-disable-doc.patch Can you have a look at implementing the solution proposed by Arnout (i.e adding a --disable-docs or --disable-documentation configure option) ? Also, it would be really great if you could push this patch, as well as the other patch we already have against imagemagick, to the upstream project. Thanks a lot! Thomas
Hi Thomas, Le 02/03/2014 00:22, Thomas Petazzoni a écrit : > Dear Romain Naour, > > On Sun, 16 Feb 2014 00:57:47 +0100, Romain Naour wrote: >> There is no options to disable the documentation, >> so remove it directly in Makefile.am >> >> Signed-off-by: Romain Naour <romain.naour@openwide.fr> >> --- >> .../imagemagick/imagemagick-02-disable-doc.patch | 47 ++++++++++++++++++++++ >> 1 file changed, 47 insertions(+) >> create mode 100644 package/imagemagick/imagemagick-02-disable-doc.patch > Can you have a look at implementing the solution proposed by Arnout > (i.e adding a --disable-docs or --disable-documentation configure > option) ? Not yet, but it's in my todo list. I'll do it as soon as possible but I have another task to finish before. > Also, it would be really great if you could push this patch, as well as > the other patch we already have against imagemagick, to the upstream > project. This is what I planned to do :) Best regards, Romain
diff --git a/package/imagemagick/imagemagick-02-disable-doc.patch b/package/imagemagick/imagemagick-02-disable-doc.patch new file mode 100644 index 0000000..b4ffec4 --- /dev/null +++ b/package/imagemagick/imagemagick-02-disable-doc.patch @@ -0,0 +1,47 @@ +imagemagick: disable doc + +There is no options to disable the documentation, +so remove it directly in Makefile.am + +Signed-off-by: Romain Naour <romain.naour@openwide.fr> +--- + Makefile.am | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c74a870..813c65e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -157,18 +157,11 @@ pkgconfig_DATA = \ + cp -f $^ $@ + + # Manual pages to install +-man_MANS = \ +- $(MAGICK_MANS) \ +- $(WAND_MANS) \ +- $(MAGICKPP_MANS) \ +- $(UTILITIES_MANS) ++man_MANS = + + # Architecture independent data files installed in the package's data directory + docdir = $(DOCUMENTATION_PATH) +-doc_DATA = \ +- LICENSE \ +- ChangeLog \ +- NEWS.txt ++doc_DATA = + + if MAINTAINER_MODE + MAINTAINER_TARGETS = \ +@@ -236,7 +229,7 @@ pkgdocdir = $(DOCUMENTATION_PATH) + DOCDIRSDOXYGEN = www/api/MagickCore www/api/MagickWand + DOCDIRSMANUAL = images images/patterns www www/api www/source www/Magick++ + DOCDIRS= $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN) +-HTML_INSTALL_DATA_TARGETS = install-data-html ++HTML_INSTALL_DATA_TARGETS = + install-data-html: + $(mkinstalldirs) $(DESTDIR)$(pkgdocdir) + $(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(pkgdocdir) +-- +1.8.5.3 +
There is no options to disable the documentation, so remove it directly in Makefile.am Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- .../imagemagick/imagemagick-02-disable-doc.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/imagemagick/imagemagick-02-disable-doc.patch