From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id D8DFE3858C52 for ; Sun, 12 Feb 2023 11:36:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D8DFE3858C52 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wm1-x32c.google.com with SMTP id r18so6849653wmq.5 for ; Sun, 12 Feb 2023 03:36:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=hLR7OCvUCrkP82HimxO/MjqPqb71dyd7yFyzKDHmvjM=; b=FVmVf8t49anLOkqDuPxMysMABlr5nRiK8ulDEGHBtE740xrURx1FLoRJDs65w4AKZW wcuLI3BobwogXzPIrreAAMitfIgR/mzPrTJrS3mHfeEAoumslXrQx7cfYIRSdxQarEHP j6KliC2mWhb30XTULtNbERk6O5PFjuKJbkv59Hy8RB7EfPlGEv+6GwVDpnzazKdIwG7D fI/4naqpu5EfuRI2ZehZTb3Gf0fkUvygX2iYGHVW65+PsPfmZaxQ58vAdP9wy7QLZ99H D459Aus/L0P3bcu61xFOIUpNH3tCEA3DqxyEijL2sXP8jPsdsbub+GeMgS8SXHqXznyz hoiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=hLR7OCvUCrkP82HimxO/MjqPqb71dyd7yFyzKDHmvjM=; b=HYUP0XOx2lOQNRVbrQxm4kKdZ9h82dFrzKj+8hR4QVV+nHRZjQ6l4PyuSIIknB5ZJB suZuWdwrC7xTloStu9z5SsbAG/Vmlo6yPEmHD+g2VirxRtFZ4G6zvE9+4QaiRoCuirRQ Z3oI7ESwc4RnGRtw0CNSaG6CudT6XCD4SZUADfkhP4A5xJdw8HcGQNU6xtc7tIRQNiQM /vXS3SrxkSEBd4WH3d3UL3y8CHNFuteGbUqfE/B5KAizEY13ZuZFq+r03w+tKqF4Kp5A kCK+g5iwQ7ENAYFDmlnIKstZvqtaBpvgxNwDJvamAaE/dRBkyRuOgxe86L0+3VjK3/Pj tjcA== X-Gm-Message-State: AO0yUKUiHslvilIjci0L9o4U0ek/kUaKBs0Ui/MfzGSWNkzmi3Ag3UzX 5sxn6ROEd2oiX10jhl3QmfXw5FJLDc2FIpKRBQ== X-Google-Smtp-Source: AK7set9A0Y6UDp2LdNxJanB5M+h0yqkYjlLxdW5ieMS/LfOl9kfe64cEKB6LsWxQkCFzS3gsmYnX7A== X-Received: by 2002:a05:600c:5013:b0:3df:e1d8:cd8f with SMTP id n19-20020a05600c501300b003dfe1d8cd8fmr3304668wmr.6.1676201808567; Sun, 12 Feb 2023 03:36:48 -0800 (PST) Received: from takamaka.gnat.com (lfbn-reu-1-488-54.w92-130.abo.wanadoo.fr. [92.130.77.54]) by smtp.gmail.com with ESMTPSA id k1-20020adff5c1000000b002bff574a250sm8173400wrp.2.2023.02.12.03.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 03:36:48 -0800 (PST) Received: by takamaka.gnat.com (Postfix, from userid 1000) id 0F03481B2E; Sun, 12 Feb 2023 12:36:46 +0100 (CET) Date: Sun, 12 Feb 2023 15:36:46 +0400 From: Joel Brobecker To: Keith Seitz via Gdb-patches Cc: Joel Brobecker Subject: Re: [PATCH] Fix doc build dependencies for --with-system-readline Message-ID: References: <20230210214224.1754620-1-keiths@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230210214224.1754620-1-keiths@redhat.com> X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi Keith, On Fri, Feb 10, 2023 at 01:42:24PM -0800, Keith Seitz via Gdb-patches wrote: > 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. Thanks for the patch! Glad to see that Tom already approved it. When pushing it, would you mind pushing it to the gdb-13-branch as well? I'll include that patch in the upcoming 13.1 release. > --- > gdb/configure | 8 ++++++-- > gdb/configure.ac | 3 +++ > gdb/doc/Makefile.in | 8 ++++++-- > 3 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/gdb/configure b/gdb/configure > index 113b7cf8a30..14ea40ca603 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 > @@ -20790,17 +20791,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 > diff --git a/gdb/configure.ac b/gdb/configure.ac > index 7c7bf88b3fb..d1a92c883af 100644 > --- a/gdb/configure.ac > +++ b/gdb/configure.ac > @@ -643,16 +643,19 @@ if test "$with_system_readline" = yes; then > 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 > AC_SUBST(READLINE) > AC_SUBST(READLINE_DEPS) > AC_SUBST(READLINE_CFLAGS) > AC_SUBST(READLINE_TEXI_INCFLAG) > +AC_SUBST(READLINE_DOC_SOURCE_INCLUDES) > > # Generate jit-reader.h > > diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in > index 5d40aa229b2..110b6088905 100644 > --- a/gdb/doc/Makefile.in > +++ b/gdb/doc/Makefile.in > @@ -121,6 +121,11 @@ PDFTEX = pdftex > # Program to generate Postscript files from DVI files. > DVIPS = dvips > > +# Readline includes. > +READLINE_SYSTEM_DOC_INCLUDES = > +READLINE_INTREE_DOC_INCLUDES = $(READLINE_DIR)/rluser.texi $(READLINE_DIR)/hsuser.texi > +READLINE_DOC_SOURCE_INCLUDES = @READLINE_DOC_SOURCE_INCLUDES@ > + > # Main GDB manual > # Note that this unconditionally includes the readline texi files, > # even when --with-system-readline is used. This is harmless because > @@ -129,8 +134,7 @@ GDB_DOC_SOURCE_INCLUDES = \ > $(srcdir)/fdl.texi \ > $(srcdir)/gpl.texi \ > $(srcdir)/agentexpr.texi \ > - $(READLINE_DIR)/rluser.texi \ > - $(READLINE_DIR)/hsuser.texi > + $(READLINE_DOC_SOURCE_INCLUDES) > GDB_DOC_BUILD_INCLUDES = \ > gdb-cfg.texi \ > GDBvn.texi > -- > 2.39.1 > -- Joel