* [PATCH 0/1] gdbsupport: Fix config.status dependency
@ 2022-09-08 6:04 Tsukasa OI
2022-09-08 6:04 ` [PATCH 1/1] " Tsukasa OI
0 siblings, 1 reply; 3+ messages in thread
From: Tsukasa OI @ 2022-09-08 6:04 UTC (permalink / raw)
To: Tsukasa OI, Pedro Alves; +Cc: gdb-patches
Hello,
While I'm digging the build pipeline using the maintainer mode, I found
something that will prevent building gdbsupport (luckily, it didn't occur by
another mistake).
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). This is not
good but prevented the problem I'll describe later.
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".
PATCH 1/1 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.
Thanks,
Tsukasa
Tsukasa OI (1):
gdbsupport: Fix config.status dependency
gdbsupport/Makefile.in | 1 +
gdbsupport/configure | 2 +-
gdbsupport/configure.ac | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
base-commit: f42546b6cc7468ac7d929181ed7b965ab60958ac
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 1/1] gdbsupport: Fix config.status dependency
2022-09-08 6:04 [PATCH 0/1] gdbsupport: Fix config.status dependency Tsukasa OI
@ 2022-09-08 6:04 ` Tsukasa OI
2022-09-08 10:23 ` Pedro Alves
0 siblings, 1 reply; 3+ messages in thread
From: Tsukasa OI @ 2022-09-08 6:04 UTC (permalink / raw)
To: Tsukasa OI, Pedro Alves; +Cc: gdb-patches
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.
---
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
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] gdbsupport: Fix config.status dependency
2022-09-08 6:04 ` [PATCH 1/1] " Tsukasa OI
@ 2022-09-08 10:23 ` Pedro Alves
0 siblings, 0 replies; 3+ messages in thread
From: Pedro Alves @ 2022-09-08 10:23 UTC (permalink / raw)
To: Tsukasa OI; +Cc: gdb-patches
On 2022-09-08 7:04 a.m., Tsukasa OI wrote:
> 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.
>
Whoops.
> It also regenerates corresponding files with the maintainer mode.
>
> gdbsupport/ChangeLog:
>
> * configure.ac: Fix config.status dependency.
> * Makefile.in: Regenerate.
> * configure: Regenerate.
This is OK, please push.
Thanks,
Pedro Alves
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-08 10:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-08 6:04 [PATCH 0/1] gdbsupport: Fix config.status dependency Tsukasa OI
2022-09-08 6:04 ` [PATCH 1/1] " Tsukasa OI
2022-09-08 10:23 ` Pedro Alves
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).