* [Buildroot] [PATCH 1/2] imagemagick: disable documentation
@ 2014-02-15 23:57 Romain Naour
2014-02-15 23:57 ` [Buildroot] [PATCH 2/2] imagemagick: use --without-bzlib when bzip2 is not selected Romain Naour
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Romain Naour @ 2014-02-15 23:57 UTC (permalink / raw)
To: buildroot
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
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
+
--
1.8.5.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 2/2] imagemagick: use --without-bzlib when bzip2 is not selected
2014-02-15 23:57 [Buildroot] [PATCH 1/2] imagemagick: disable documentation Romain Naour
@ 2014-02-15 23:57 ` Romain Naour
2014-02-26 8:47 ` Peter Korsgaard
2014-02-17 21:23 ` [Buildroot] [PATCH 1/2] imagemagick: disable documentation Arnout Vandecappelle
2014-03-01 23:22 ` Thomas Petazzoni
2 siblings, 1 reply; 8+ messages in thread
From: Romain Naour @ 2014-02-15 23:57 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
package/imagemagick/imagemagick.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index c1e17c7..4f2a65f 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -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))
--
1.8.5.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] imagemagick: use --without-bzlib when bzip2 is not selected
2014-02-15 23:57 ` [Buildroot] [PATCH 2/2] imagemagick: use --without-bzlib when bzip2 is not selected Romain Naour
@ 2014-02-26 8:47 ` Peter Korsgaard
0 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2014-02-26 8:47 UTC (permalink / raw)
To: buildroot
>>>>> "Romain" == Romain Naour <romain.naour@openwide.fr> writes:
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Committed, thanks.
> ---
> package/imagemagick/imagemagick.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
> index c1e17c7..4f2a65f 100644
> --- a/package/imagemagick/imagemagick.mk
> +++ b/package/imagemagick/imagemagick.mk
> @@ -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))
> --
> 1.8.5.3
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] imagemagick: disable documentation
2014-02-15 23:57 [Buildroot] [PATCH 1/2] imagemagick: disable documentation Romain Naour
2014-02-15 23:57 ` [Buildroot] [PATCH 2/2] imagemagick: use --without-bzlib when bzip2 is not selected Romain Naour
@ 2014-02-17 21:23 ` Arnout Vandecappelle
2014-02-17 22:15 ` Romain Naour
2014-03-01 23:22 ` Thomas Petazzoni
2 siblings, 1 reply; 8+ messages in thread
From: Arnout Vandecappelle @ 2014-02-17 21:23 UTC (permalink / raw)
To: buildroot
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
--
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] imagemagick: disable documentation
2014-02-17 21:23 ` [Buildroot] [PATCH 1/2] imagemagick: disable documentation Arnout Vandecappelle
@ 2014-02-17 22:15 ` Romain Naour
2014-02-17 23:07 ` Arnout Vandecappelle
0 siblings, 1 reply; 8+ messages in thread
From: Romain Naour @ 2014-02-17 22:15 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] imagemagick: disable documentation
2014-02-17 22:15 ` Romain Naour
@ 2014-02-17 23:07 ` Arnout Vandecappelle
0 siblings, 0 replies; 8+ messages in thread
From: Arnout Vandecappelle @ 2014-02-17 23:07 UTC (permalink / raw)
To: buildroot
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
>
--
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] imagemagick: disable documentation
2014-02-15 23:57 [Buildroot] [PATCH 1/2] imagemagick: disable documentation Romain Naour
2014-02-15 23:57 ` [Buildroot] [PATCH 2/2] imagemagick: use --without-bzlib when bzip2 is not selected Romain Naour
2014-02-17 21:23 ` [Buildroot] [PATCH 1/2] imagemagick: disable documentation Arnout Vandecappelle
@ 2014-03-01 23:22 ` Thomas Petazzoni
2014-03-02 10:45 ` Romain Naour
2 siblings, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2014-03-01 23:22 UTC (permalink / raw)
To: buildroot
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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] imagemagick: disable documentation
2014-03-01 23:22 ` Thomas Petazzoni
@ 2014-03-02 10:45 ` Romain Naour
0 siblings, 0 replies; 8+ messages in thread
From: Romain Naour @ 2014-03-02 10:45 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-03-02 10:45 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-15 23:57 [Buildroot] [PATCH 1/2] imagemagick: disable documentation Romain Naour
2014-02-15 23:57 ` [Buildroot] [PATCH 2/2] imagemagick: use --without-bzlib when bzip2 is not selected Romain Naour
2014-02-26 8:47 ` Peter Korsgaard
2014-02-17 21:23 ` [Buildroot] [PATCH 1/2] imagemagick: disable documentation Arnout Vandecappelle
2014-02-17 22:15 ` Romain Naour
2014-02-17 23:07 ` Arnout Vandecappelle
2014-03-01 23:22 ` Thomas Petazzoni
2014-03-02 10:45 ` Romain Naour
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.