imagemagick: disable documentation

PATCH Superseded Romain Naour 4 participants 8 messages Feb 15, 2014 – Mar 2, 2014

lore

Share & tools

lore

Romain Naour

author

2014-02-15 23:57 UTC #0 lore raw

PATCH 1/2 imagemagick: disable documentation

There is no options to disable the documentation,
so remove it directly in Makefile.am

Signed-off-by Romain Naour <[email protected]>

---
 .../imagemagick/imagemagick-02-disable-doc.patch   | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/imagemagick/imagemagick-02-disable-doc.patch

package/imagemagick/imagemagick-02-disable-doc.patch new file +47 -0

new file mode 100644
index 0000000..b4ffec4
@@ -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 <[email protected]>
+---
+ 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
+

Signature · 1 line

1.8.5.3

Romain Naour

author

2014-02-15 23:57 UTC #1 lore raw

PATCH 2/2 imagemagick: use --without-bzlib when bzip2 is not selected

Signed-off-by Romain Naour <[email protected]>

---
 package/imagemagick/imagemagick.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/imagemagick/imagemagick.mk +1 -1

index c1e17c7..4f2a65f 100644
@@ -115,7 +115,7 @@ ifeq ($(BR2_PACKAGE_BZIP2),y)
 IMAGEMAGICK_CONF_OPT += --with-bzlib
 IMAGEMAGICK_DEPENDENCIES += bzip2
 else
-IMAGEMAGICK_CONF_OPT += --without-bzip2
+IMAGEMAGICK_CONF_OPT += --without-bzlib
 endif
 
 $(eval $(autotools-package))

Signature · 1 line

1.8.5.3

Peter Korsgaard

2014-02-26 08:47 UTC #2 lore raw

PATCH 2/2 imagemagick: use --without-bzlib when bzip2 is not selected

Quoted 3 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
Signed-off-by Romain Naour <[email protected]>

Committed, thanks.

Quoted 24 lines

---
 package/imagemagick/imagemagick.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/imagemagick/imagemagick.mk +1 -1

index c1e17c7..4f2a65f 100644
@@ -115,7 +115,7 @@ ifeq ($(BR2_PACKAGE_BZIP2),y)
 IMAGEMAGICK_CONF_OPT += --with-bzlib
 IMAGEMAGICK_DEPENDENCIES += bzip2
 else
-IMAGEMAGICK_CONF_OPT += --without-bzip2
+IMAGEMAGICK_CONF_OPT += --without-bzlib
 endif
 
 $(eval $(autotools-package))

Signature · 6 lines

1.8.5.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 1 line

Bye, Peter Korsgaard

Arnout Vandecappelle

2014-02-17 21:23 UTC #3 lore raw

PATCH 1/2 imagemagick: disable documentation

In reply to Romain Naour

Quoted 4 lines · Romain Naour

There is no options to disable the documentation,
so remove it directly in Makefile.am
Signed-off-by Romain Naour <[email protected]>

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

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
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

Romain Naour

author

2014-02-17 22:15 UTC #4 lore raw

PATCH 1/2 imagemagick: disable documentation

Hi Arnout,

Le 17/02/2014 22:23, Arnout Vandecappelle a ?crit :

Quoted 6 lines · Romain Naour

Quoted 4 lines
There is no options to disable the documentation,
so remove it directly in Makefile.am
Signed-off-by Romain Naour <[email protected]>
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.

Quoted 3 lines

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

Arnout Vandecappelle

2014-02-17 23:07 UTC #5 lore raw

PATCH 1/2 imagemagick: disable documentation

Quoted 8 lines · Romain Naour

Hi Arnout,
Le 17/02/2014 22:23, Arnout Vandecappelle a ?crit :
Quoted 5 lines · Romain Naour
Quoted 4 lines
There is no options to disable the documentation,
so remove it directly in Makefile.am
Signed-off-by Romain Naour <[email protected]>

Quoted 8 lines

Quoted 1 line
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.

Quoted 11 lines

Then documentation is removed from target.
Quoted 3 lines
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

Quoted 4 lines

Best regards,
Romain Naour

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
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

Thomas Petazzoni

2014-03-01 23:22 UTC #6 lore raw

PATCH 1/2 imagemagick: disable documentation

In reply to Romain Naour

Dear Romain Naour,

Quoted 8 lines · Romain Naour

There is no options to disable the documentation,
so remove it directly in Makefile.am
Signed-off-by Romain Naour <[email protected]>
---
 .../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

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Romain Naour

author

2014-03-02 10:45 UTC #7 lore raw

PATCH 1/2 imagemagick: disable documentation

Hi Thomas,

Le 02/03/2014 00:22, Thomas Petazzoni a ?crit :

Quoted 6 lines

Dear Romain Naour,
Quoted 3 lines · Romain Naour
There is no options to disable the documentation,
so remove it directly in Makefile.am

Quoted 8 lines

Quoted 5 lines
Signed-off-by Romain Naour <[email protected]>
---
  .../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.

Quoted 3 lines

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