diff options
| author | Keith Seitz <keiths@redhat.com> | 2023-02-13 06:14:40 -0800 |
|---|---|---|
| committer | Keith Seitz <keiths@redhat.com> | 2023-02-13 06:14:40 -0800 |
| commit | 14d0e6818a022b72c265f15f63c8ccc2fc8c302a (patch) | |
| tree | 133c5120144a770f0f467f7a535d849bf2f3a21d /gdb/configure | |
| parent | b7eab2a9d4f4e92692daf14b09fc95ca11b72e30 (diff) | |
| download | fsf-binutils-gdb-14d0e6818a022b72c265f15f63c8ccc2fc8c302a.zip fsf-binutils-gdb-14d0e6818a022b72c265f15f63c8ccc2fc8c302a.tar.gz fsf-binutils-gdb-14d0e6818a022b72c265f15f63c8ccc2fc8c302a.tar.bz2 | |
Fix doc build dependencies for --with-system-readline
PR build/30108 concerns building gdb documentation with
--with-sytem-readline. If the in-tree readline directory is
missing, though, the docs will fail to build:
make[4]: Entering directory '/home/keiths/work/readline-doc-issue/linux/gdb/doc'
make[4]: *** No rule to make target '../../../src/gdb/doc/../../readline/readline/doc/rluser.texi', needed by 'gdb.info'. Stop.
The listed file (and hsuser.texi) are conditionally included by gdb.texinfo.
When system readline is used, gdb/configure.ac will leave
READLINE_TEXI_INCFLAGS empty, causing doc/Makefile.in to output a line to
$BUILD/doc/GDBvn.texi with "@set SYSTEM_READLINE". This surpresses the
inclusion of the missing files. They are not needed or used in this
scenario.
However, GDB_DOC_SOURCE_INCLUDES always lists these two files as dependencies,
thus provoking the build error whenever readline/ is missing.
This patch fixes this by creating (essentially) a conditional setting of the
dependencies to be included from readline.
Diffstat (limited to 'gdb/configure')
| -rwxr-xr-x | gdb/configure | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gdb/configure b/gdb/configure index 8b20399..1114bcd 100755 --- a/gdb/configure +++ b/gdb/configure @@ -746,6 +746,7 @@ LIBEXPAT HAVE_LIBEXPAT JIT_READER_DIR TARGET_PTR +READLINE_DOC_SOURCE_INCLUDES READLINE_TEXI_INCFLAG READLINE_CFLAGS READLINE_DEPS @@ -11449,7 +11450,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11452 "configure" +#line 11453 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11555,7 +11556,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11558 "configure" +#line 11559 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -20793,17 +20794,20 @@ $as_echo "$gdb_cv_readline_ok" >&6; } READLINE_DEPS= READLINE_CFLAGS= READLINE_TEXI_INCFLAG= + READLINE_DOC_SOURCE_INCLUDES='$(READLINE_SYSTEM_DOC_INCLUDES)' else READLINE='$(READLINE_DIR)/libreadline.a' READLINE_DEPS='$(READLINE)' READLINE_CFLAGS='-I$(READLINE_SRC)/..' READLINE_TEXI_INCFLAG='-I $(READLINE_DIR)' + READLINE_DOC_SOURCE_INCLUDES='$(READLINE_INTREE_DOC_INCLUDES)' fi + # Generate jit-reader.h # This is typedeffed to GDB_CORE_ADDR in jit-reader.h |