public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Tsukasa OI <a4lg@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] gdbsupport: Fix config.status dependency
Date: Thu,  8 Sep 2022 11:04:25 +0000 (GMT)	[thread overview]
Message-ID: <20220908110425.B83433858D28@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=39eedb20b7e95e469d11667c11233233e9d0226b

commit 39eedb20b7e95e469d11667c11233233e9d0226b
Author: Tsukasa OI <research_trasio@irq.a4lg.com>
Date:   Thu Sep 8 02:54:15 2022 +0000

    gdbsupport: Fix config.status dependency
    
    Commit 171fba11ab27 ("Make GDBserver abort on internal error in development mode")
    created a new substitution CONFIG_STATUS_DEPENDENCIES but this is used by
    Makefile.in (which is not regenerated by that commit).  After regenerating
    it, it is found that CONFIG_STATUS_DEPENDENCIES value is not valid, making
    gdbsupport fail to build.
    
    Since the CONFIG_STATUS_DEPENDENCIES value is used in the Makefile, macro
    substitution must have a Makefile format but commit 171fba11ab27 used shell
    format "$srcdir/../bfd/development.sh".
    
    This commit fixes this issue by substituting "$srcdir" (shell format) to
    "$(srcdir)" (Makefile format).  It preserves the dependency as Pedro
    intended and fixes the build problem.
    
    It also regenerates corresponding files with the maintainer mode.
    
    gdbsupport/ChangeLog:
    
            * configure.ac: Fix config.status dependency.
            * Makefile.in: Regenerate.
            * configure: Regenerate.

Diff:
---
 gdbsupport/Makefile.in  | 1 +
 gdbsupport/configure    | 2 +-
 gdbsupport/configure.ac | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
index bdceff3b56a..6aadae41031 100644
--- a/gdbsupport/Makefile.in
+++ b/gdbsupport/Makefile.in
@@ -233,6 +233,7 @@ CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
diff --git a/gdbsupport/configure b/gdbsupport/configure
index 0b48521deb6..1b0752609e5 100755
--- a/gdbsupport/configure
+++ b/gdbsupport/configure
@@ -10470,7 +10470,7 @@ $as_echo "#define USE_WIN32API 1" >>confdefs.h
     ;;
 esac
 
-CONFIG_STATUS_DEPENDENCIES='$srcdir/../bfd/development.sh'
+CONFIG_STATUS_DEPENDENCIES='$(srcdir)/../bfd/development.sh'
 
 
 ac_config_files="$ac_config_files Makefile"
diff --git a/gdbsupport/configure.ac b/gdbsupport/configure.ac
index ac2ade6a220..3b461bc82de 100644
--- a/gdbsupport/configure.ac
+++ b/gdbsupport/configure.ac
@@ -81,7 +81,7 @@ case ${host} in
     ;;
 esac
 
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$srcdir/../bfd/development.sh'])
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(srcdir)/../bfd/development.sh'])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

                 reply	other threads:[~2022-09-08 11:04 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220908110425.B83433858D28@sourceware.org \
    --to=a4lg@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).