[Buildroot] [PATCH 2/3] package/gdb: use our missing script to disable the doc

Romain Naour romain.naour at gmail.com
Wed Mar 9 00:00:19 UTC 2016


In order to workaround a build issue when makeinfo is missing on the host,
use our custom 'missing' script. The script bundled with gdb sources return the
exit status of the given program (makeinfo) and stop the build.

Since the build system try to use makeinfo at several places (config, make,
install), we need to override MAKEINFO with the corresponding _OPTS variable.

Fixes:
http://autobuild.buildroot.net/results/4fcad074e1c9d66e19283bac9e15039990eb9430/

Signed-off-by: Romain Naour <romain.naour at gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Cc: Vicente Olivert Riera <Vincent.Riera at imgtec.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
Cc: "Yann E. MORIN" <yann.morin.1998 at free.fr>
---
 package/gdb/gdb.mk | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 32d52eb..fad99d1 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -51,18 +51,16 @@ 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
-	if test -e $(@D)/bfd/doc/Makefile.in ; then \
-		$(SED) 's/^INFO_DEPS =.*$$/INFO_DEPS =/' $(@D)/bfd/doc/Makefile.in ; \
-	fi
-	if test -e $(@D)/gprof/Makefile.in ; then \
-		$(SED) 's/^INFO_DEPS =.*$$/INFO_DEPS =/' $(@D)/gprof/Makefile.in ; \
-	fi
-endef
-GDB_PRE_CONFIGURE_HOOKS += GDB_DISABLE_DOC
-HOST_GDB_PRE_CONFIGURE_HOOKS += GDB_DISABLE_DOC
+# Don't build documentation. It takes up extra space / build time,
+# and sometimes needs specific makeinfo versions to work.
+# Since gdb use an updated version of the 'missing' script from automake
+# >= v1.12b, use our customized version.
+GDB_CONF_OPTS += MAKEINFO="$(TOPDIR)/support/scripts/missing makeinfo"
+GDB_MAKE_OPTS += MAKEINFO="$(TOPDIR)/support/scripts/missing makeinfo"
+GDB_INSTALL_OPTS += MAKEINFO="$(TOPDIR)/support/scripts/missing makeinfo"
+HOST_GDB_CONF_OPTS += MAKEINFO="$(TOPDIR)/support/scripts/missing makeinfo"
+HOST_GDB_MAKE_OPTS += MAKEINFO="$(TOPDIR)/support/scripts/missing makeinfo"
+HOST_GDB_INSTALL_OPTS += MAKEINFO="$(TOPDIR)/support/scripts/missing makeinfo"
 
 # When gdb sources are fetched from the binutils-gdb repository, they
 # also contain the binutils sources, but binutils shouldn't be built,
-- 
2.5.0




More information about the buildroot mailing list