* [Buildroot] [PATCHv4] gdb: prevent building the documentation
@ 2015-09-10 8:56 Vicente Olivert Riera
2015-09-10 13:23 ` Arnout Vandecappelle
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Vicente Olivert Riera @ 2015-09-10 8:56 UTC (permalink / raw)
To: buildroot
Force gdb to not build the documentation. This way we avoid depending on
host-texinfo. This is a temporary fix until upstream accepts a proposed
--disable-docs configure option.
Since the documentation will not be build at all, we can remove the
parts related to host-texinfo and MAKEINFO in the gdb.mk file.
Fixes:
http://autobuild.buildroot.net/results/dd5/dd50ed99abb2c8495def826866b184030953f90e/
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Brendan Heading <brendanheading@gmail.com>
---
Changes v3 -> v4:
- Use a pre-configure-hook instead of post-patch-hook as the last one
is not called in the OVERRIDE_SRCDIR case (Arnout Vandecappelle)
Changes v2 -> v3:
- Use the post-patch-hook also for host-gdb (Brendan Heading)
- Remove unnecessary GDB_FROM_GIT (Romain Naour)
Changes v1 -> v2:
- Indent the sed command
- Use a post-patch-hook instead of pre-configure-hook
- Remove the parts related to host-texinfo and MAKEINFO
- Ammend the commit log to be more appropriate
package/gdb/gdb.mk | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 338de20..58a1232 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -11,13 +11,11 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.xz
ifeq ($(BR2_arc),y)
GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION))
GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
-GDB_FROM_GIT = y
endif
ifeq ($(BR2_microblaze),y)
GDB_SITE = $(call github,Xilinx,gdb,$(GDB_VERSION))
GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
-GDB_FROM_GIT = y
endif
# Use .tar.bz2 for 7.7.x since there was no .tar.xz release back then
@@ -53,6 +51,13 @@ GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH
HOST_GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH
endif
+# Prevent gdb to build the documentation
+define GDB_DISABLE_DOC
+ $(SED) '/^SUBDIRS =/ s/doc//' $(@D)/gdb/Makefile.in
+endef
+GDB_PRE_CONFIGURE_HOOKS += GDB_DISABLE_DOC
+HOST_GDB_PRE_CONFIGURE_HOOKS += GDB_DISABLE_DOC
+
# When gdb sources are fetched from the binutils-gdb repository, they
# also contain the binutils sources, but binutils shouldn't be built,
# so we disable it.
@@ -165,15 +170,6 @@ else
HOST_GDB_CONF_OPTS += --without-python
endif
-ifeq ($(GDB_FROM_GIT),y)
-GDB_DEPENDENCIES += host-texinfo
-HOST_GDB_DEPENDENCIES += host-texinfo
-else
-# don't generate documentation
-GDB_CONF_ENV += ac_cv_prog_MAKEINFO=missing
-HOST_GDB_CONF_ENV += ac_cv_prog_MAKEINFO=missing
-endif
-
# legacy $arch-linux-gdb symlink
define HOST_GDB_ADD_SYMLINK
cd $(HOST_DIR)/usr/bin && \
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv4] gdb: prevent building the documentation
2015-09-10 8:56 [Buildroot] [PATCHv4] gdb: prevent building the documentation Vicente Olivert Riera
@ 2015-09-10 13:23 ` Arnout Vandecappelle
2015-09-11 17:32 ` Thomas Petazzoni
2015-10-01 7:11 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2015-09-10 13:23 UTC (permalink / raw)
To: buildroot
On 10-09-15 10:56, Vicente Olivert Riera wrote:
> Force gdb to not build the documentation. This way we avoid depending on
> host-texinfo. This is a temporary fix until upstream accepts a proposed
> --disable-docs configure option.
>
> Since the documentation will not be build at all, we can remove the
> parts related to host-texinfo and MAKEINFO in the gdb.mk file.
>
> Fixes:
>
> http://autobuild.buildroot.net/results/dd5/dd50ed99abb2c8495def826866b184030953f90e/
>
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Tested-by: Brendan Heading <brendanheading@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
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: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv4] gdb: prevent building the documentation
2015-09-10 8:56 [Buildroot] [PATCHv4] gdb: prevent building the documentation Vicente Olivert Riera
2015-09-10 13:23 ` Arnout Vandecappelle
@ 2015-09-11 17:32 ` Thomas Petazzoni
2015-10-01 7:11 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2015-09-11 17:32 UTC (permalink / raw)
To: buildroot
Dear Vicente Olivert Riera,
On Thu, 10 Sep 2015 09:56:40 +0100, Vicente Olivert Riera wrote:
> Force gdb to not build the documentation. This way we avoid depending on
> host-texinfo. This is a temporary fix until upstream accepts a proposed
> --disable-docs configure option.
>
> Since the documentation will not be build at all, we can remove the
> parts related to host-texinfo and MAKEINFO in the gdb.mk file.
>
> Fixes:
>
> http://autobuild.buildroot.net/results/dd5/dd50ed99abb2c8495def826866b184030953f90e/
>
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Tested-by: Brendan Heading <brendanheading@gmail.com>
> ---
> Changes v3 -> v4:
> - Use a pre-configure-hook instead of post-patch-hook as the last one
> is not called in the OVERRIDE_SRCDIR case (Arnout Vandecappelle)
> Changes v2 -> v3:
> - Use the post-patch-hook also for host-gdb (Brendan Heading)
> - Remove unnecessary GDB_FROM_GIT (Romain Naour)
> Changes v1 -> v2:
> - Indent the sed command
> - Use a post-patch-hook instead of pre-configure-hook
> - Remove the parts related to host-texinfo and MAKEINFO
> - Ammend the commit log to be more appropriate
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv4] gdb: prevent building the documentation
2015-09-10 8:56 [Buildroot] [PATCHv4] gdb: prevent building the documentation Vicente Olivert Riera
2015-09-10 13:23 ` Arnout Vandecappelle
2015-09-11 17:32 ` Thomas Petazzoni
@ 2015-10-01 7:11 ` Thomas Petazzoni
2015-10-01 8:41 ` Vicente Olivert Riera
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2015-10-01 7:11 UTC (permalink / raw)
To: buildroot
Vicente, Romain,
On Thu, 10 Sep 2015 09:56:40 +0100, Vicente Olivert Riera wrote:
> Force gdb to not build the documentation. This way we avoid depending on
> host-texinfo. This is a temporary fix until upstream accepts a proposed
> --disable-docs configure option.
>
> Since the documentation will not be build at all, we can remove the
> parts related to host-texinfo and MAKEINFO in the gdb.mk file.
>
> Fixes:
>
> http://autobuild.buildroot.net/results/dd5/dd50ed99abb2c8495def826866b184030953f90e/
>
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Tested-by: Brendan Heading <brendanheading@gmail.com>
Seems like this is not yet working completely for all situations:
http://autobuild.buildroot.org/results/244/2442e697d8a300496434fd42fcb1ee3941d13e06/build-end.log
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv4] gdb: prevent building the documentation
2015-10-01 7:11 ` Thomas Petazzoni
@ 2015-10-01 8:41 ` Vicente Olivert Riera
2015-10-02 22:18 ` Romain Naour
0 siblings, 1 reply; 6+ messages in thread
From: Vicente Olivert Riera @ 2015-10-01 8:41 UTC (permalink / raw)
To: buildroot
Hello Thomas, Romain,
On 10/01/2015 08:11 AM, Thomas Petazzoni wrote:
> Vicente, Romain,
>
> On Thu, 10 Sep 2015 09:56:40 +0100, Vicente Olivert Riera wrote:
>> Force gdb to not build the documentation. This way we avoid depending on
>> host-texinfo. This is a temporary fix until upstream accepts a proposed
>> --disable-docs configure option.
>>
>> Since the documentation will not be build at all, we can remove the
>> parts related to host-texinfo and MAKEINFO in the gdb.mk file.
>>
>> Fixes:
>>
>> http://autobuild.buildroot.net/results/dd5/dd50ed99abb2c8495def826866b184030953f90e/
>>
>> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>> Tested-by: Brendan Heading <brendanheading@gmail.com>
>
> Seems like this is not yet working completely for all situations:
>
> http://autobuild.buildroot.org/results/244/2442e697d8a300496434fd42fcb1ee3941d13e06/build-end.log
I will have a look.
Romain, how is going the upstream request about the --disable-docs option?
Regards,
Vincent.
> Best regards,
>
> Thomas
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCHv4] gdb: prevent building the documentation
2015-10-01 8:41 ` Vicente Olivert Riera
@ 2015-10-02 22:18 ` Romain Naour
0 siblings, 0 replies; 6+ messages in thread
From: Romain Naour @ 2015-10-02 22:18 UTC (permalink / raw)
To: buildroot
Hi Vicente,
Le 01/10/2015 10:41, Vicente Olivert Riera a ?crit :
> Hello Thomas, Romain,
>
> On 10/01/2015 08:11 AM, Thomas Petazzoni wrote:
>> Vicente, Romain,
>>
>> On Thu, 10 Sep 2015 09:56:40 +0100, Vicente Olivert Riera wrote:
>>> Force gdb to not build the documentation. This way we avoid depending on
>>> host-texinfo. This is a temporary fix until upstream accepts a proposed
>>> --disable-docs configure option.
>>>
>>> Since the documentation will not be build at all, we can remove the
>>> parts related to host-texinfo and MAKEINFO in the gdb.mk file.
>>>
>>> Fixes:
>>>
>>> http://autobuild.buildroot.net/results/dd5/dd50ed99abb2c8495def826866b184030953f90e/
>>>
>>> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>>> Tested-by: Brendan Heading <brendanheading@gmail.com>
>>
>> Seems like this is not yet working completely for all situations:
>>
>> http://autobuild.buildroot.org/results/244/2442e697d8a300496434fd42fcb1ee3941d13e06/build-end.log
>
> I will have a look.
>
> Romain, how is going the upstream request about the --disable-docs option?
The patch I submitted upstream is not complete since we need to disable the
documentation for bfd and gprof.
https://sourceware.org/ml/gdb-patches/2015-09/msg00073.html
Maybe the easiest solution is to make sure that the missing script return 0
instead of the error code... thoughts ?
Best regards,
Romain
>
> Regards,
>
> Vincent.
>
>> Best regards,
>>
>> Thomas
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-02 22:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-10 8:56 [Buildroot] [PATCHv4] gdb: prevent building the documentation Vicente Olivert Riera
2015-09-10 13:23 ` Arnout Vandecappelle
2015-09-11 17:32 ` Thomas Petazzoni
2015-10-01 7:11 ` Thomas Petazzoni
2015-10-01 8:41 ` Vicente Olivert Riera
2015-10-02 22:18 ` Romain Naour
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox