This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] [RFC] gdb: add disable-docs option


If makeinfo is not found in the system then the missing
script is used to warn the user.

Before commit e30465112ed4c6320dd19107302057a5f7712cf2 the missing
script returned 0 after printing the message.

Now, missing return 127 (command not found) to the Makefile and
the build fail.

As suggested [1], add a new option to disable the documentation.

[1] http://lists.busybox.net/pipermail/buildroot/2015-September/138824.html

Fixes:
http://autobuild.buildroot.net/results/dee/dee1326baf26ad1eb6e12a7d033428eca50d00bc/build-end.log

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Cc: Yao Qi  <yao.qi@linaro.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
This patch is untested since I can't regenerate the configure script
due to autoconf version mismatch.

configure.ac:34: error: Please use exactly Autoconf 2.64 instead of 2.69.
---
 gdb/ChangeLog    | 4 ++++
 gdb/Makefile.in  | 7 ++++++-
 gdb/configure.ac | 7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 370980d..900e53f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-06  Romain Naour <romain.naour@openwide.fr>  (tiny change)
+
+	* configure.ac: add disable-docs option
+
 2015-09-04  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* tui/tui-data.c (win_with_focus): Remove cast of NULL pointer.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 0d7cf97..bfbb6be 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1089,7 +1089,12 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 
 TSOBS = inflow.o
 
-SUBDIRS = doc @subdirs@ data-directory $(GNULIB_BUILDDIR)
+SUBDIRS = @subdirs@ data-directory $(GNULIB_BUILDDIR)
+
+if INSTALL_DOC
+SUBDIRS += doc
+endif
+
 CLEANDIRS = $(SUBDIRS)
 
 # List of subdirectories in the build tree that must exist.
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 29d0b63..79c370b 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -107,6 +107,13 @@ PACKAGE=gdb
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ])
 AC_SUBST(PACKAGE)
 
+# Enable/Disable documentation
+AC_ARG_ENABLE([docs],
+  [AS_HELP_STRING([--disable-docs],
+    [disable building of documentation])],
+  wantdocs=$enableval, wantdocs=yes)
+AM_CONDITIONAL([INSTALL_DOC], [test "$wantdocs" = "yes"])
+
 # We never need to detect it in this sub-configure.
 # But preserve it for config.status --recheck.
 AC_ARG_VAR(MAKEINFO,
-- 
2.4.3


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]