Skip to contentSkip to conversation

gdb: prevent building the documentation

PATCH Superseded Vicente Olivert Riera 4 participants 6 messages Sep 10, 2015 – Oct 2, 2015

lore
Share & tools
lore

Vicente Olivert Riera

author
#0 lore raw

PATCH v4 1/1 gdb: prevent building the documentation

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 <[email protected]>
Tested-by Brendan Heading <[email protected]>

---
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(-)
package/gdb/gdb.mk +7 -11
index 338de20..58a1232 100644
@@ -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 && \
Signature · 1 line
1.7.1
#1 lore raw

PATCH v4 1/1 gdb: prevent building the documentation

Quoted 7 lines · Vicente Olivert Riera

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.

Quoted 6 lines

Fixes:

http://autobuild.buildroot.net/results/dd5/dd50ed99abb2c8495def826866b184030953f90e/

Signed-off-by Vicente Olivert Riera <[email protected]>
Tested-by Brendan Heading <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

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:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
Applied
#2 lore raw

PATCH v4 1/1 gdb: prevent building the documentation

In reply to Vicente Olivert Riera

Dear Vicente Olivert Riera,

Quoted 13 lines · Vicente Olivert Riera

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 <[email protected]>
Tested-by Brendan Heading <[email protected]>
Quoted 12 lines

---
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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH v4 1/1 gdb: prevent building the documentation

In reply to Vicente Olivert Riera

Vicente, Romain,

Quoted 7 lines · Vicente Olivert Riera

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.

Quoted 6 lines

Fixes:

http://autobuild.buildroot.net/results/dd5/dd50ed99abb2c8495def826866b184030953f90e/

Signed-off-by Vicente Olivert Riera <[email protected]>
Tested-by Brendan Heading <[email protected]>

Seems like this is not yet working completely for all situations:

http://autobuild.buildroot.org/results/244/2442e697d8a300496434fd42fcb1ee3941d13e06/build-end.log

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#4 lore raw

PATCH v4 1/1 gdb: prevent building the documentation

Hello Thomas, Romain,

Quoted 12 lines · Thomas Petazzoni

Vicente, Romain,

Quoted 9 lines · Vicente Olivert Riera

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:

Quoted 8 lines
Quoted 4 lines

http://autobuild.buildroot.net/results/dd5/dd50ed99abb2c8495def826866b184030953f90e/

Signed-off-by Vicente Olivert Riera <[email protected]>
Tested-by Brendan Heading <[email protected]>

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.

Quoted 4 lines

Best regards,

Thomas

#5 lore raw

PATCH v4 1/1 gdb: prevent building the documentation

Hi Vicente,

Le 01/10/2015 10:41, Vicente Olivert Riera a ?crit :

Quoted 20 lines

Hello Thomas, Romain,

Quoted 17 lines · Thomas Petazzoni

Vicente, Romain,

Quoted 13 lines · Vicente Olivert Riera

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 <[email protected]>
Tested-by Brendan Heading <[email protected]>
Quoted 7 lines
Quoted 3 lines

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

Quoted 9 lines

Regards,

Vincent.

Quoted 4 lines

Best regards,

Thomas