* [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
@ 2020-01-05 7:30 Joel Brobecker
2020-01-06 3:06 ` Simon Marchi
0 siblings, 1 reply; 14+ messages in thread
From: Joel Brobecker @ 2020-01-05 7:30 UTC (permalink / raw)
To: gdb-patches; +Cc: Tom Tromey, Joel Brobecker
Hello,
Following the discussions on the gdb@ mailing-list regarding
the fact that GDB 9 is not buildable when configured in tree,
I propose the following patch for the gdb-9-branch. Ideally,
I would have liked to propose it for both master and gdb-9-branch,
but I think toplevel configure is supposed to be coordinated
between GCC and ourselves. Looking at this patch, I don't think
it's necessary, since we hope to lift that limitation at some
point.
---------------------------------------------------------------------------
The move of gnulib to the toplevel directory is causing the GDB build
to break if configured in tree. We hope to lift that limitation at
some point but, in the meantime, this commit allows us to abort
the initial configure right away with a clear error message should
the user attempt to build in tree.
ChangeLog:
* configure.ac: Abort the build with an error if trying to build
GDB in tree.
* configure: Regenerate.
Tested by running the configure script with no argument, --enable-gdb,
and --disable-gdb; from both the toplevel source directory as well
as from other directories.
OK to push to gdb-9-branch?
Thanks,
--
Joel
---
configure | 9 +++++++++
configure.ac | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/configure b/configure
index 6a9719f6091..6273a6a4055 100755
--- a/configure
+++ b/configure
@@ -2279,6 +2279,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test x"${enable_gdb}" != x"no"; then
+ # For this branch, we do not support building GDB in-tree.
+ # Try to detect whether we are in this situation or not by
+ # searching for a couple of known files in the source directory.
+ if test -f gnulib/update-gnulib.sh -a -f gdb/ChangeLog; then
+ as_fn_error $? "GDB must be configured and built in a directory separate from its sources" "$LINENO" 5
+ fi
+fi
+
progname=$0
# if PWD already has a value, it is probably wrong.
if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
diff --git a/configure.ac b/configure.ac
index 7433badc217..25b3392da9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,15 @@ m4_include([config/isl.m4])
AC_INIT(move-if-change)
AC_DISABLE_OPTION_CHECKING
+if test x"${enable_gdb}" != x"no"; then
+ # For this branch, we do not support building GDB in-tree.
+ # Try to detect whether we are in this situation or not by
+ # searching for a couple of known files in the source directory.
+ if test -f gnulib/update-gnulib.sh -a -f gdb/ChangeLog; then
+ AC_MSG_ERROR([GDB must be configured and built in a directory separate from its sources])
+ fi
+fi
+
progname=$0
# if PWD already has a value, it is probably wrong.
if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
--
2.17.1
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-05 7:30 [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree Joel Brobecker
@ 2020-01-06 3:06 ` Simon Marchi
2020-01-17 18:24 ` Joel Brobecker
0 siblings, 1 reply; 14+ messages in thread
From: Simon Marchi @ 2020-01-06 3:06 UTC (permalink / raw)
To: Joel Brobecker, gdb-patches; +Cc: Tom Tromey
On 2020-01-05 2:30 a.m., Joel Brobecker wrote:
> Hello,
>
> Following the discussions on the gdb@ mailing-list regarding
> the fact that GDB 9 is not buildable when configured in tree,
> I propose the following patch for the gdb-9-branch. Ideally,
> I would have liked to propose it for both master and gdb-9-branch,
> but I think toplevel configure is supposed to be coordinated
> between GCC and ourselves. Looking at this patch, I don't think
> it's necessary, since we hope to lift that limitation at some
> point.
>
> ---------------------------------------------------------------------------
>
> The move of gnulib to the toplevel directory is causing the GDB build
> to break if configured in tree. We hope to lift that limitation at
> some point but, in the meantime, this commit allows us to abort
> the initial configure right away with a clear error message should
> the user attempt to build in tree.
>
> ChangeLog:
>
> * configure.ac: Abort the build with an error if trying to build
> GDB in tree.
> * configure: Regenerate.
>
> Tested by running the configure script with no argument, --enable-gdb,
> and --disable-gdb; from both the toplevel source directory as well
> as from other directories.
>
> OK to push to gdb-9-branch?
>
> Thanks,
> --
> Joel
>
> ---
> configure | 9 +++++++++
> configure.ac | 9 +++++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/configure b/configure
> index 6a9719f6091..6273a6a4055 100755
> --- a/configure
> +++ b/configure
> @@ -2279,6 +2279,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>
>
>
> +if test x"${enable_gdb}" != x"no"; then
> + # For this branch, we do not support building GDB in-tree.
> + # Try to detect whether we are in this situation or not by
> + # searching for a couple of known files in the source directory.
> + if test -f gnulib/update-gnulib.sh -a -f gdb/ChangeLog; then
> + as_fn_error $? "GDB must be configured and built in a directory separate from its sources" "$LINENO" 5
> + fi
> +fi
> +
> progname=$0
> # if PWD already has a value, it is probably wrong.
> if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
> diff --git a/configure.ac b/configure.ac
> index 7433badc217..25b3392da9a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -33,6 +33,15 @@ m4_include([config/isl.m4])
> AC_INIT(move-if-change)
> AC_DISABLE_OPTION_CHECKING
>
> +if test x"${enable_gdb}" != x"no"; then
> + # For this branch, we do not support building GDB in-tree.
> + # Try to detect whether we are in this situation or not by
> + # searching for a couple of known files in the source directory.
> + if test -f gnulib/update-gnulib.sh -a -f gdb/ChangeLog; then
> + AC_MSG_ERROR([GDB must be configured and built in a directory separate from its sources])
Finish the message with a period?
Some people who only know the "./configure && make && make install" recipe
might not know how (or that it's even possible) to configure and build in a
separate directory, so they'll be stuck there. I think it would be helpful
to give an example of how to do that, like:
GDB must be configured and built in a directory separate from its sources.
To do so, create a dedicated directory for your GDB build and invoke the configure
script from that directory:
$ mkdir my-gdb-build
$ cd my-gdb-build
$ ../path/to/gdb-x.y.z/configure [configure args]
$ make
Otherwise, that looks good to me. I'm starting to look at Tom's patchset to move gdbsupport
to the top-level, and I agree that it would be a bit dangerous to finish the work that late
in the cycle, so I'm fine if we prohibit building in the source directory for that release.
It will just look strange that it's the case only for one specific release, but it's not really
a big deal.
Simon
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-06 3:06 ` Simon Marchi
@ 2020-01-17 18:24 ` Joel Brobecker
2020-01-17 18:24 ` Simon Marchi
2020-01-17 18:26 ` Tom Tromey
0 siblings, 2 replies; 14+ messages in thread
From: Joel Brobecker @ 2020-01-17 18:24 UTC (permalink / raw)
To: Simon Marchi; +Cc: gdb-patches, Tom Tromey
[-- Attachment #1: Type: text/plain, Size: 1517 bytes --]
Hi Simon,
Thanks for the review.
> > +if test x"${enable_gdb}" != x"no"; then
> > + # For this branch, we do not support building GDB in-tree.
> > + # Try to detect whether we are in this situation or not by
> > + # searching for a couple of known files in the source directory.
> > + if test -f gnulib/update-gnulib.sh -a -f gdb/ChangeLog; then
> > + AC_MSG_ERROR([GDB must be configured and built in a directory separate from its sources])
>
> Finish the message with a period?
Of course! FWIW, I modeled this to other calls to AC_MSG_ERROR ;-)
> Some people who only know the "./configure && make && make install" recipe
> might not know how (or that it's even possible) to configure and build in a
> separate directory, so they'll be stuck there. I think it would be helpful
> to give an example of how to do that, like:
>
> GDB must be configured and built in a directory separate from its sources.
>
> To do so, create a dedicated directory for your GDB build and invoke the configure
> script from that directory:
>
> $ mkdir my-gdb-build
> $ cd my-gdb-build
> $ ../path/to/gdb-x.y.z/configure [configure args]
> $ make
>
> Otherwise, that looks good to me.
Attached is a revised patch. I chose to use the same sequence as
the one in gdb/README, just for consistency.
ChangeLog:
* configure.ac: Abort the build with an error if trying to build
GDB in tree.
* configure: Regenerate.
For gdb-9-branch only... OK to push?
--
Joel
[-- Attachment #2: 0001-Abort-configure-immediately-if-building-GDB-in-tree.patch --]
[-- Type: text/x-diff, Size: 2716 bytes --]
From 8664d4b725eeb9c5845fa36331f2184d2c1f8596 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Fri, 17 Jan 2020 19:13:15 +0100
Subject: [PATCH] Abort configure immediately if building GDB in tree
The move of gnulib to the top src directory is causing the GDB build
to break if configured in tree. We hope to lift that limitation at
some point but, in the meantime, this commit allows us to abort
the initial configure right away with a clear error message should
the user attempt to build in tree.
ChangeLog:
* configure.ac: Abort the build with an error if trying to build
GDB in tree.
* configure: Regenerate.
---
configure | 17 +++++++++++++++++
configure.ac | 17 +++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/configure b/configure
index 6a9719f6091..7168a4e90e0 100755
--- a/configure
+++ b/configure
@@ -2279,6 +2279,23 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test x"${enable_gdb}" != x"no"; then
+ # For this branch, we do not support building GDB in-tree.
+ # Try to detect whether we are in this situation or not by
+ # searching for a couple of known files in the source directory.
+ if test -f gnulib/update-gnulib.sh -a -f gdb/ChangeLog; then
+ as_fn_error $? "GDB must be configured and built in a directory separate from its sources.
+
+To do so, create a dedicated directory for your GDB build and invoke
+the configure script from that directory:
+
+ $ mkdir build
+ $ cd build
+ $ <full path to your sources>/gdb-VERSION/configure [etc...]
+ $ make" "$LINENO" 5
+ fi
+fi
+
progname=$0
# if PWD already has a value, it is probably wrong.
if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
diff --git a/configure.ac b/configure.ac
index 7433badc217..e5ca1eaa57a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,23 @@ m4_include([config/isl.m4])
AC_INIT(move-if-change)
AC_DISABLE_OPTION_CHECKING
+if test x"${enable_gdb}" != x"no"; then
+ # For this branch, we do not support building GDB in-tree.
+ # Try to detect whether we are in this situation or not by
+ # searching for a couple of known files in the source directory.
+ if test -f gnulib/update-gnulib.sh -a -f gdb/ChangeLog; then
+ AC_MSG_ERROR([GDB must be configured and built in a directory separate from its sources.
+
+To do so, create a dedicated directory for your GDB build and invoke
+the configure script from that directory:
+
+ $ mkdir build
+ $ cd build
+ $ <full path to your sources>/gdb-VERSION/configure [[etc...]]
+ $ make])
+ fi
+fi
+
progname=$0
# if PWD already has a value, it is probably wrong.
if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
--
2.17.1
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-17 18:24 ` Joel Brobecker
@ 2020-01-17 18:24 ` Simon Marchi
2020-01-17 18:43 ` Joel Brobecker
2020-01-17 18:26 ` Tom Tromey
1 sibling, 1 reply; 14+ messages in thread
From: Simon Marchi @ 2020-01-17 18:24 UTC (permalink / raw)
To: Joel Brobecker; +Cc: gdb-patches, Tom Tromey
On 2020-01-17 1:15 p.m., Joel Brobecker wrote:
> Hi Simon,
>
> Thanks for the review.
>
>>> +if test x"${enable_gdb}" != x"no"; then
>>> + # For this branch, we do not support building GDB in-tree.
>>> + # Try to detect whether we are in this situation or not by
>>> + # searching for a couple of known files in the source directory.
>>> + if test -f gnulib/update-gnulib.sh -a -f gdb/ChangeLog; then
>>> + AC_MSG_ERROR([GDB must be configured and built in a directory separate from its sources])
>>
>> Finish the message with a period?
>
> Of course! FWIW, I modeled this to other calls to AC_MSG_ERROR ;-)
>
>> Some people who only know the "./configure && make && make install" recipe
>> might not know how (or that it's even possible) to configure and build in a
>> separate directory, so they'll be stuck there. I think it would be helpful
>> to give an example of how to do that, like:
>>
>> GDB must be configured and built in a directory separate from its sources.
>>
>> To do so, create a dedicated directory for your GDB build and invoke the configure
>> script from that directory:
>>
>> $ mkdir my-gdb-build
>> $ cd my-gdb-build
>> $ ../path/to/gdb-x.y.z/configure [configure args]
>> $ make
>>
>> Otherwise, that looks good to me.
>
> Attached is a revised patch. I chose to use the same sequence as
> the one in gdb/README, just for consistency.
LGTM, thanks!
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-17 18:24 ` Simon Marchi
@ 2020-01-17 18:43 ` Joel Brobecker
2020-01-30 22:56 ` Sergio Durigan Junior
0 siblings, 1 reply; 14+ messages in thread
From: Joel Brobecker @ 2020-01-17 18:43 UTC (permalink / raw)
To: Simon Marchi; +Cc: gdb-patches, Tom Tromey
> > Attached is a revised patch. I chose to use the same sequence as
> > the one in gdb/README, just for consistency.
>
> LGTM, thanks!
Thanks Simon (and thanks Tom also). Now pushed!
--
Joel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-17 18:43 ` Joel Brobecker
@ 2020-01-30 22:56 ` Sergio Durigan Junior
2020-01-31 8:55 ` Eli Zaretskii
0 siblings, 1 reply; 14+ messages in thread
From: Sergio Durigan Junior @ 2020-01-30 22:56 UTC (permalink / raw)
To: Joel Brobecker; +Cc: Simon Marchi, gdb-patches, Tom Tromey
On Friday, January 17 2020, Joel Brobecker wrote:
>> > Attached is a revised patch. I chose to use the same sequence as
>> > the one in gdb/README, just for consistency.
>>
>> LGTM, thanks!
>
> Thanks Simon (and thanks Tom also). Now pushed!
Hey, Joel!
I just found out that this commit broke the snapshot generation for the
gdb-9-branch. It's pretty easy to reproduce the problem locally:
$ ./src-release.sh -x gdb
==> Cleaning sources.
==> Making gdb-9.0.90.20200130/
==> configure --target=i386-pc-linux-gnu --disable-binutils --disable-gas --disable-gold --disable-gprof --disable-ld --enable-gdb --enable-libctf --enable-libdecnumber --enable-readline --enable-sim
configure: error: GDB must be configured and built in a directory separate from its sources.
...
I'm wondering what to do here. I think I found a hacky and ugly
solution here, but I'm trying to see if there's a better approach.
Meanwhile, I thought I'd report this problem in case you already have a
better idea.
Cheers,
--
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
http://sergiodj.net/
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-30 22:56 ` Sergio Durigan Junior
@ 2020-01-31 8:55 ` Eli Zaretskii
2020-01-31 21:02 ` Sergio Durigan Junior
0 siblings, 1 reply; 14+ messages in thread
From: Eli Zaretskii @ 2020-01-31 8:55 UTC (permalink / raw)
To: Sergio Durigan Junior; +Cc: brobecker, simark, gdb-patches, tom
> From: Sergio Durigan Junior <sergiodj@redhat.com>
> Cc: Simon Marchi <simark@simark.ca>, gdb-patches@sourceware.org, Tom Tromey <tom@tromey.com>
> Date: Thu, 30 Jan 2020 16:06:18 -0500
>
> $ ./src-release.sh -x gdb
> ==> Cleaning sources.
> ==> Making gdb-9.0.90.20200130/
> ==> configure --target=i386-pc-linux-gnu --disable-binutils --disable-gas --disable-gold --disable-gprof --disable-ld --enable-gdb --enable-libctf --enable-libdecnumber --enable-readline --enable-sim
> configure: error: GDB must be configured and built in a directory separate from its sources.
> ...
>
> I'm wondering what to do here. I think I found a hacky and ugly
> solution here, but I'm trying to see if there's a better approach.
A special command-line switch to 'configure', to be used by
src-release.sh?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-31 8:55 ` Eli Zaretskii
@ 2020-01-31 21:02 ` Sergio Durigan Junior
2020-01-31 22:52 ` Sergio Durigan Junior
0 siblings, 1 reply; 14+ messages in thread
From: Sergio Durigan Junior @ 2020-01-31 21:02 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: brobecker, simark, gdb-patches, tom
On Friday, January 31 2020, Eli Zaretskii wrote:
>> From: Sergio Durigan Junior <sergiodj@redhat.com>
>> Cc: Simon Marchi <simark@simark.ca>, gdb-patches@sourceware.org, Tom Tromey <tom@tromey.com>
>> Date: Thu, 30 Jan 2020 16:06:18 -0500
>>
>> $ ./src-release.sh -x gdb
>> ==> Cleaning sources.
>> ==> Making gdb-9.0.90.20200130/
>> ==> configure --target=i386-pc-linux-gnu --disable-binutils
>> --disable-gas --disable-gold --disable-gprof --disable-ld
>> --enable-gdb --enable-libctf --enable-libdecnumber --enable-readline
>> --enable-sim
>> configure: error: GDB must be configured and built in a directory separate from its sources.
>> ...
>>
>> I'm wondering what to do here. I think I found a hacky and ugly
>> solution here, but I'm trying to see if there's a better approach.
>
> A special command-line switch to 'configure', to be used by
> src-release.sh?
A quick attempt here didn't really work. The script is able to finish
the build and create a tarball, but for some reason the gdb directory is
not configured/built.
Thanks,
--
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
http://sergiodj.net/
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-31 21:02 ` Sergio Durigan Junior
@ 2020-01-31 22:52 ` Sergio Durigan Junior
2020-02-01 7:24 ` Eli Zaretskii
2020-02-01 10:19 ` Joel Brobecker
0 siblings, 2 replies; 14+ messages in thread
From: Sergio Durigan Junior @ 2020-01-31 22:52 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: brobecker, simark, gdb-patches, tom
On Friday, January 31 2020, I wrote:
> On Friday, January 31 2020, Eli Zaretskii wrote:
>
>>> From: Sergio Durigan Junior <sergiodj@redhat.com>
>>> Cc: Simon Marchi <simark@simark.ca>, gdb-patches@sourceware.org, Tom Tromey <tom@tromey.com>
>>> Date: Thu, 30 Jan 2020 16:06:18 -0500
>>>
>>> $ ./src-release.sh -x gdb
>>> ==> Cleaning sources.
>>> ==> Making gdb-9.0.90.20200130/
>>> ==> configure --target=i386-pc-linux-gnu --disable-binutils
>>> --disable-gas --disable-gold --disable-gprof --disable-ld
>>> --enable-gdb --enable-libctf --enable-libdecnumber --enable-readline
>>> --enable-sim
>>> configure: error: GDB must be configured and built in a directory separate from its sources.
>>> ...
>>>
>>> I'm wondering what to do here. I think I found a hacky and ugly
>>> solution here, but I'm trying to see if there's a better approach.
>>
>> A special command-line switch to 'configure', to be used by
>> src-release.sh?
>
> A quick attempt here didn't really work. The script is able to finish
> the build and create a tarball, but for some reason the gdb directory is
> not configured/built.
OK, I think I have something that works. When 'configure' is invoked
with '--enable-src-release-build', a tarball is generated and, as far as
I have checked, contains the correct snapshot.
WDYT?
--
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
http://sergiodj.net/
diff --git a/ChangeLog b/ChangeLog
index 0bfe989885..de13206e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-01-31 Sergio Durigan Junior <sergiodj@redhat.com>
+
+ * configure.ac: Don't abort the build if trying to build GDB in tree
+ _and_ invoking with '--enable-src-release-build'.
+ * configure: Regenerate.
+ * src-release.sh (do_proto_toplev): Invoke 'configure' using
+ '--enable-src-release-build'.
+
2020-01-17 Joel Brobecker <brobecker@adacore.com>
* configure.ac: Abort the build with an error if trying to build
diff --git a/configure b/configure
index 7168a4e90e..276f33fee3 100755
--- a/configure
+++ b/configure
@@ -2279,7 +2279,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test x"${enable_gdb}" != x"no"; then
+if test x"${enable_gdb}" != x"no" -a x"${enable_src_release_build}" != x"yes"; then
# For this branch, we do not support building GDB in-tree.
# Try to detect whether we are in this situation or not by
# searching for a couple of known files in the source directory.
diff --git a/configure.ac b/configure.ac
index e5ca1eaa57..cd0867dd76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ m4_include([config/isl.m4])
AC_INIT(move-if-change)
AC_DISABLE_OPTION_CHECKING
-if test x"${enable_gdb}" != x"no"; then
+if test x"${enable_gdb}" != x"no" -a x"${enable_src_release_build}" != x"yes"; then
# For this branch, we do not support building GDB in-tree.
# Try to detect whether we are in this situation or not by
# searching for a couple of known files in the source directory.
diff --git a/src-release.sh b/src-release.sh
index 275f0f24b5..68e824c749 100755
--- a/src-release.sh
+++ b/src-release.sh
@@ -99,8 +99,8 @@ do_proto_toplev()
*) disables="$disables --disable-$dir" ;;
esac
done
- echo "==> configure --target=i386-pc-linux-gnu $disables $enables"
- ./configure --target=i386-pc-linux-gnu $disables $enables
+ echo "==> configure --target=i386-pc-linux-gnu --enable-src-release-build=yes $disables $enables"
+ ./configure --target=i386-pc-linux-gnu --enable-src-release-build=yes $disables $enables
$MAKE configure-host configure-target \
ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
CC_FOR_TARGET="$CC" CXX_FOR_TARGET="$CXX"
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-31 22:52 ` Sergio Durigan Junior
@ 2020-02-01 7:24 ` Eli Zaretskii
2020-02-01 10:19 ` Joel Brobecker
1 sibling, 0 replies; 14+ messages in thread
From: Eli Zaretskii @ 2020-02-01 7:24 UTC (permalink / raw)
To: Sergio Durigan Junior; +Cc: brobecker, simark, gdb-patches, tom
> From: Sergio Durigan Junior <sergiodj@redhat.com>
> Cc: brobecker@adacore.com, simark@simark.ca, gdb-patches@sourceware.org, tom@tromey.com
> Date: Fri, 31 Jan 2020 16:39:49 -0500
>
> OK, I think I have something that works. When 'configure' is invoked
> with '--enable-src-release-build', a tarball is generated and, as far as
> I have checked, contains the correct snapshot.
>
> WDYT?
It certainly looks like something I had in mind, but since I know very
little about sourceware configury, I hope others will chime in.
Thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-31 22:52 ` Sergio Durigan Junior
2020-02-01 7:24 ` Eli Zaretskii
@ 2020-02-01 10:19 ` Joel Brobecker
2020-02-01 10:26 ` Joel Brobecker
1 sibling, 1 reply; 14+ messages in thread
From: Joel Brobecker @ 2020-02-01 10:19 UTC (permalink / raw)
To: Sergio Durigan Junior; +Cc: Eli Zaretskii, simark, gdb-patches, tom
> >>> I'm wondering what to do here. I think I found a hacky and ugly
> >>> solution here, but I'm trying to see if there's a better approach.
> >>
> >> A special command-line switch to 'configure', to be used by
> >> src-release.sh?
> >
> > A quick attempt here didn't really work. The script is able to finish
> > the build and create a tarball, but for some reason the gdb directory is
> > not configured/built.
>
> OK, I think I have something that works. When 'configure' is invoked
> with '--enable-src-release-build', a tarball is generated and, as far as
> I have checked, contains the correct snapshot.
>
> WDYT?
Thanks! I didn't realize that this would impact source packaging
like that.
Let's go with your patch. I'm about to start working on the release,
so I'll apply it for you.
Thanks again,
> diff --git a/ChangeLog b/ChangeLog
> index 0bfe989885..de13206e2e 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,11 @@
> +2020-01-31 Sergio Durigan Junior <sergiodj@redhat.com>
> +
> + * configure.ac: Don't abort the build if trying to build GDB in tree
> + _and_ invoking with '--enable-src-release-build'.
> + * configure: Regenerate.
> + * src-release.sh (do_proto_toplev): Invoke 'configure' using
> + '--enable-src-release-build'.
> +
> 2020-01-17 Joel Brobecker <brobecker@adacore.com>
>
> * configure.ac: Abort the build with an error if trying to build
> diff --git a/configure b/configure
> index 7168a4e90e..276f33fee3 100755
> --- a/configure
> +++ b/configure
> @@ -2279,7 +2279,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>
>
>
> -if test x"${enable_gdb}" != x"no"; then
> +if test x"${enable_gdb}" != x"no" -a x"${enable_src_release_build}" != x"yes"; then
> # For this branch, we do not support building GDB in-tree.
> # Try to detect whether we are in this situation or not by
> # searching for a couple of known files in the source directory.
> diff --git a/configure.ac b/configure.ac
> index e5ca1eaa57..cd0867dd76 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -33,7 +33,7 @@ m4_include([config/isl.m4])
> AC_INIT(move-if-change)
> AC_DISABLE_OPTION_CHECKING
>
> -if test x"${enable_gdb}" != x"no"; then
> +if test x"${enable_gdb}" != x"no" -a x"${enable_src_release_build}" != x"yes"; then
> # For this branch, we do not support building GDB in-tree.
> # Try to detect whether we are in this situation or not by
> # searching for a couple of known files in the source directory.
> diff --git a/src-release.sh b/src-release.sh
> index 275f0f24b5..68e824c749 100755
> --- a/src-release.sh
> +++ b/src-release.sh
> @@ -99,8 +99,8 @@ do_proto_toplev()
> *) disables="$disables --disable-$dir" ;;
> esac
> done
> - echo "==> configure --target=i386-pc-linux-gnu $disables $enables"
> - ./configure --target=i386-pc-linux-gnu $disables $enables
> + echo "==> configure --target=i386-pc-linux-gnu --enable-src-release-build=yes $disables $enables"
> + ./configure --target=i386-pc-linux-gnu --enable-src-release-build=yes $disables $enables
> $MAKE configure-host configure-target \
> ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
> CC_FOR_TARGET="$CC" CXX_FOR_TARGET="$CXX"
--
Joel
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-02-01 10:19 ` Joel Brobecker
@ 2020-02-01 10:26 ` Joel Brobecker
2020-02-01 20:38 ` Sergio Durigan Junior
0 siblings, 1 reply; 14+ messages in thread
From: Joel Brobecker @ 2020-02-01 10:26 UTC (permalink / raw)
To: Sergio Durigan Junior; +Cc: Eli Zaretskii, simark, gdb-patches, tom
> > >>> I'm wondering what to do here. I think I found a hacky and ugly
> > >>> solution here, but I'm trying to see if there's a better approach.
> > >>
> > >> A special command-line switch to 'configure', to be used by
> > >> src-release.sh?
> > >
> > > A quick attempt here didn't really work. The script is able to finish
> > > the build and create a tarball, but for some reason the gdb directory is
> > > not configured/built.
> >
> > OK, I think I have something that works. When 'configure' is invoked
> > with '--enable-src-release-build', a tarball is generated and, as far as
> > I have checked, contains the correct snapshot.
> >
> > WDYT?
>
> Thanks! I didn't realize that this would impact source packaging
> like that.
>
> Let's go with your patch. I'm about to start working on the release,
> so I'll apply it for you.
Or not. Jonah just reported another blocking issue :-(, so I won't
be creating this release this weekend.
So the "good" news is that you can push the patch yourself!
--
Joel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-02-01 10:26 ` Joel Brobecker
@ 2020-02-01 20:38 ` Sergio Durigan Junior
0 siblings, 0 replies; 14+ messages in thread
From: Sergio Durigan Junior @ 2020-02-01 20:38 UTC (permalink / raw)
To: Joel Brobecker; +Cc: Eli Zaretskii, simark, gdb-patches, tom
On Saturday, February 01 2020, Joel Brobecker wrote:
>> > >>> I'm wondering what to do here. I think I found a hacky and ugly
>> > >>> solution here, but I'm trying to see if there's a better approach.
>> > >>
>> > >> A special command-line switch to 'configure', to be used by
>> > >> src-release.sh?
>> > >
>> > > A quick attempt here didn't really work. The script is able to finish
>> > > the build and create a tarball, but for some reason the gdb directory is
>> > > not configured/built.
>> >
>> > OK, I think I have something that works. When 'configure' is invoked
>> > with '--enable-src-release-build', a tarball is generated and, as far as
>> > I have checked, contains the correct snapshot.
>> >
>> > WDYT?
>>
>> Thanks! I didn't realize that this would impact source packaging
>> like that.
>>
>> Let's go with your patch. I'm about to start working on the release,
>> so I'll apply it for you.
>
> Or not. Jonah just reported another blocking issue :-(, so I won't
> be creating this release this weekend.
>
> So the "good" news is that you can push the patch yourself!
Thanks for the quick review, Joel :-).
Below is what I pushed.
Cheers,
--
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
http://sergiodj.net/
From 1aa93c3a9b9a216703aaf882b3af541f3bc3042a Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Sat, 1 Feb 2020 15:33:31 -0500
Subject: [PATCH] Implement '--enable-src-release-build' option and make
src-release.sh use it
The generation of snapshots has been broken since we've disable
in-tree builds for GDB. Given that src-release.sh performs a build
before creating the release tarball, and that this build is performed
in-tree, the solution we found is to implement a new top-level
configure flag called '--enable-src-release-build' which disables the
in-tree build restriction, and then make src-release.sh use it.
ChangeLog:
2020-02-01 Sergio Durigan Junior <sergiodj@redhat.com>
Eli Zaretskii <eliz@gnu.org>
* configure.ac: Don't abort the build if trying to build GDB in tree
_and_ invoking with '--enable-src-release-build'.
* configure: Regenerate.
* src-release.sh (do_proto_toplev): Invoke 'configure' using
Change-Id: Ic6dd55accd9a03e62fe498f7fd704fb67f44bfa9
---
ChangeLog | 8 ++++++++
configure | 2 +-
configure.ac | 2 +-
src-release.sh | 4 ++--
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0bfe989885..211451345e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-02-01 Sergio Durigan Junior <sergiodj@redhat.com>
+
+ * configure.ac: Don't abort the build if trying to build GDB in tree
+ _and_ invoking with '--enable-src-release-build'.
+ * configure: Regenerate.
+ * src-release.sh (do_proto_toplev): Invoke 'configure' using
+ '--enable-src-release-build'.
+
2020-01-17 Joel Brobecker <brobecker@adacore.com>
* configure.ac: Abort the build with an error if trying to build
diff --git a/configure b/configure
index 7168a4e90e..276f33fee3 100755
--- a/configure
+++ b/configure
@@ -2279,7 +2279,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test x"${enable_gdb}" != x"no"; then
+if test x"${enable_gdb}" != x"no" -a x"${enable_src_release_build}" != x"yes"; then
# For this branch, we do not support building GDB in-tree.
# Try to detect whether we are in this situation or not by
# searching for a couple of known files in the source directory.
diff --git a/configure.ac b/configure.ac
index e5ca1eaa57..cd0867dd76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ m4_include([config/isl.m4])
AC_INIT(move-if-change)
AC_DISABLE_OPTION_CHECKING
-if test x"${enable_gdb}" != x"no"; then
+if test x"${enable_gdb}" != x"no" -a x"${enable_src_release_build}" != x"yes"; then
# For this branch, we do not support building GDB in-tree.
# Try to detect whether we are in this situation or not by
# searching for a couple of known files in the source directory.
diff --git a/src-release.sh b/src-release.sh
index 275f0f24b5..68e824c749 100755
--- a/src-release.sh
+++ b/src-release.sh
@@ -99,8 +99,8 @@ do_proto_toplev()
*) disables="$disables --disable-$dir" ;;
esac
done
- echo "==> configure --target=i386-pc-linux-gnu $disables $enables"
- ./configure --target=i386-pc-linux-gnu $disables $enables
+ echo "==> configure --target=i386-pc-linux-gnu --enable-src-release-build=yes $disables $enables"
+ ./configure --target=i386-pc-linux-gnu --enable-src-release-build=yes $disables $enables
$MAKE configure-host configure-target \
ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
CC_FOR_TARGET="$CC" CXX_FOR_TARGET="$CXX"
--
2.21.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree
2020-01-17 18:24 ` Joel Brobecker
2020-01-17 18:24 ` Simon Marchi
@ 2020-01-17 18:26 ` Tom Tromey
1 sibling, 0 replies; 14+ messages in thread
From: Tom Tromey @ 2020-01-17 18:26 UTC (permalink / raw)
To: Joel Brobecker; +Cc: Simon Marchi, gdb-patches, Tom Tromey
>>>>> "Joel" == Joel Brobecker <brobecker@adacore.com> writes:
Joel> For gdb-9-branch only... OK to push?
Looks good to me.
Tom
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-02-01 20:38 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-05 7:30 [RFA/gdb-9-branch] Abort configure immediately if building GDB in tree Joel Brobecker
2020-01-06 3:06 ` Simon Marchi
2020-01-17 18:24 ` Joel Brobecker
2020-01-17 18:24 ` Simon Marchi
2020-01-17 18:43 ` Joel Brobecker
2020-01-30 22:56 ` Sergio Durigan Junior
2020-01-31 8:55 ` Eli Zaretskii
2020-01-31 21:02 ` Sergio Durigan Junior
2020-01-31 22:52 ` Sergio Durigan Junior
2020-02-01 7:24 ` Eli Zaretskii
2020-02-01 10:19 ` Joel Brobecker
2020-02-01 10:26 ` Joel Brobecker
2020-02-01 20:38 ` Sergio Durigan Junior
2020-01-17 18:26 ` Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox