* [PATCH] Fixes accidental renaming of gdb.py file (i.e. libstdc++.so.6.0.22-gdb.py)
@ 2015-07-04 1:50 Michael Darling
2015-07-17 0:57 ` Michael Darling
0 siblings, 1 reply; 4+ messages in thread
From: Michael Darling @ 2015-07-04 1:50 UTC (permalink / raw)
To: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 3148 bytes --]
The addition of libstdc++fs broke an inexact and fragile method in the
libstdc++-v3/python makefile, so it mis-names a python script after
libstdc++fs rather than libstdc++.
With DESTDIR /usr/lib, toolexeclibdir ../lib, and the .so version of
6.0.21, this makefile used to install the python script to
/usr/lib/libstdc++.so.6.0.21-gdb.py.
Once libstdc++fs was added, this makefile installs the python script
to /usr/lib/libstdc++fs.a-gdb.py.
This makefile examines files named libstdc++* in
DESTDIR/toolexeclibdir, excluding: symlinks; *.la files; and previous
*-gdb.py files. Its comments report it is done this way because
"libtool hides the real names from us".
This patch changes the makefile so it examines files named libstdc++.*
(notice the addition of the dot.) Although this is still not an
optimum method, it at least puts the makefile on the right track
again. Adding the dot is more future-proof than excluding files
starting with libstdc++fs, because of the possibility of future
additions of similarly named libraries.
The patch below is also an attachment to this email.
Index: libstdc++-v3/ChangeLog
===================================================================
--- libstdc++-v3/ChangeLog (revision 225409)
+++ libstdc++-v3/ChangeLog (working copy)
@@ -1,3 +1,9 @@
+2015-07-03 Michael Darling <darlingm@gmail.com>
+
+ * python/Makefile.am: python script name based off libstdc++.* rather
+ than libstdc++*, to avoid being mis-named after libstdc++fs.
+ * python/Makefile.in: Regenerate.
+
2015-07-03 Jonathan Wakely <jwakely@redhat.com>
* doc/xml/manual/status_cxx2017.xml: Update status table.
Index: libstdc++-v3/python/Makefile.am
===================================================================
--- libstdc++-v3/python/Makefile.am (revision 225409)
+++ libstdc++-v3/python/Makefile.am (working copy)
@@ -45,11 +45,11 @@
@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
## We want to install gdb.py as SOMETHING-gdb.py. SOMETHING is the
## full name of the final library. We want to ignore symlinks, the
-## .la file, and any previous -gdb.py file. This is inherently
-## fragile, but there does not seem to be a better option, because
-## libtool hides the real names from us.
+## .la file, any previous -gdb.py file, and libstdc++fs*. This is
+## inherently fragile, but there does not seem to be a better option,
+## because libtool hides the real names from us.
@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
- for file in libstdc++*; do \
+ for file in libstdc++.*; do \
case $$file in \
*-gdb.py) ;; \
*.la) ;; \
Index: libstdc++-v3/python/Makefile.in
===================================================================
--- libstdc++-v3/python/Makefile.in (revision 225409)
+++ libstdc++-v3/python/Makefile.in (working copy)
@@ -547,7 +547,7 @@
install-data-local: gdb.py
@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
- for file in libstdc++*; do \
+ for file in libstdc++.*; do \
case $$file in \
*-gdb.py) ;; \
*.la) ;; \
[-- Attachment #2: gcc.libstdc++-v3.python.dot.fix.patch --]
[-- Type: application/octet-stream, Size: 1980 bytes --]
Index: libstdc++-v3/ChangeLog
===================================================================
--- libstdc++-v3/ChangeLog (revision 225409)
+++ libstdc++-v3/ChangeLog (working copy)
@@ -1,3 +1,9 @@
+2015-07-03 Michael Darling <darlingm@gmail.com>
+
+ * python/Makefile.am: python script name based off libstdc++.* rather
+ than libstdc++*, to avoid being mis-named after libstdc++fs.
+ * python/Makefile.in: Regenerate.
+
2015-07-03 Jonathan Wakely <jwakely@redhat.com>
* doc/xml/manual/status_cxx2017.xml: Update status table.
Index: libstdc++-v3/python/Makefile.am
===================================================================
--- libstdc++-v3/python/Makefile.am (revision 225409)
+++ libstdc++-v3/python/Makefile.am (working copy)
@@ -45,11 +45,11 @@
@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
## We want to install gdb.py as SOMETHING-gdb.py. SOMETHING is the
## full name of the final library. We want to ignore symlinks, the
-## .la file, and any previous -gdb.py file. This is inherently
-## fragile, but there does not seem to be a better option, because
-## libtool hides the real names from us.
+## .la file, any previous -gdb.py file, and libstdc++fs*. This is
+## inherently fragile, but there does not seem to be a better option,
+## because libtool hides the real names from us.
@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
- for file in libstdc++*; do \
+ for file in libstdc++.*; do \
case $$file in \
*-gdb.py) ;; \
*.la) ;; \
Index: libstdc++-v3/python/Makefile.in
===================================================================
--- libstdc++-v3/python/Makefile.in (revision 225409)
+++ libstdc++-v3/python/Makefile.in (working copy)
@@ -547,7 +547,7 @@
install-data-local: gdb.py
@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
- for file in libstdc++*; do \
+ for file in libstdc++.*; do \
case $$file in \
*-gdb.py) ;; \
*.la) ;; \
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fixes accidental renaming of gdb.py file (i.e. libstdc++.so.6.0.22-gdb.py)
2015-07-04 1:50 [PATCH] Fixes accidental renaming of gdb.py file (i.e. libstdc++.so.6.0.22-gdb.py) Michael Darling
@ 2015-07-17 0:57 ` Michael Darling
2016-08-31 14:52 ` Gerald Pfeifer
0 siblings, 1 reply; 4+ messages in thread
From: Michael Darling @ 2015-07-17 0:57 UTC (permalink / raw)
To: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 3518 bytes --]
Ping. I don't have write access.
The attached patch still works with current trunk source, only failing
on the ChangeLog due to submissions since then.
On Fri, Jul 3, 2015 at 9:50 PM, Michael Darling <darlingm@gmail.com> wrote:
> The addition of libstdc++fs broke an inexact and fragile method in the
> libstdc++-v3/python makefile, so it mis-names a python script after
> libstdc++fs rather than libstdc++.
>
> With DESTDIR /usr/lib, toolexeclibdir ../lib, and the .so version of
> 6.0.21, this makefile used to install the python script to
> /usr/lib/libstdc++.so.6.0.21-gdb.py.
>
> Once libstdc++fs was added, this makefile installs the python script
> to /usr/lib/libstdc++fs.a-gdb.py.
>
> This makefile examines files named libstdc++* in
> DESTDIR/toolexeclibdir, excluding: symlinks; *.la files; and previous
> *-gdb.py files. Its comments report it is done this way because
> "libtool hides the real names from us".
>
> This patch changes the makefile so it examines files named libstdc++.*
> (notice the addition of the dot.) Although this is still not an
> optimum method, it at least puts the makefile on the right track
> again. Adding the dot is more future-proof than excluding files
> starting with libstdc++fs, because of the possibility of future
> additions of similarly named libraries.
>
> The patch below is also an attachment to this email.
>
>
>
> Index: libstdc++-v3/ChangeLog
> ===================================================================
> --- libstdc++-v3/ChangeLog (revision 225409)
> +++ libstdc++-v3/ChangeLog (working copy)
> @@ -1,3 +1,9 @@
> +2015-07-03 Michael Darling <darlingm@gmail.com>
> +
> + * python/Makefile.am: python script name based off libstdc++.* rather
> + than libstdc++*, to avoid being mis-named after libstdc++fs.
> + * python/Makefile.in: Regenerate.
> +
> 2015-07-03 Jonathan Wakely <jwakely@redhat.com>
>
> * doc/xml/manual/status_cxx2017.xml: Update status table.
> Index: libstdc++-v3/python/Makefile.am
> ===================================================================
> --- libstdc++-v3/python/Makefile.am (revision 225409)
> +++ libstdc++-v3/python/Makefile.am (working copy)
> @@ -45,11 +45,11 @@
> @$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
> ## We want to install gdb.py as SOMETHING-gdb.py. SOMETHING is the
> ## full name of the final library. We want to ignore symlinks, the
> -## .la file, and any previous -gdb.py file. This is inherently
> -## fragile, but there does not seem to be a better option, because
> -## libtool hides the real names from us.
> +## .la file, any previous -gdb.py file, and libstdc++fs*. This is
> +## inherently fragile, but there does not seem to be a better option,
> +## because libtool hides the real names from us.
> @here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
> - for file in libstdc++*; do \
> + for file in libstdc++.*; do \
> case $$file in \
> *-gdb.py) ;; \
> *.la) ;; \
> Index: libstdc++-v3/python/Makefile.in
> ===================================================================
> --- libstdc++-v3/python/Makefile.in (revision 225409)
> +++ libstdc++-v3/python/Makefile.in (working copy)
> @@ -547,7 +547,7 @@
> install-data-local: gdb.py
> @$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
> @here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
> - for file in libstdc++*; do \
> + for file in libstdc++.*; do \
> case $$file in \
> *-gdb.py) ;; \
> *.la) ;; \
[-- Attachment #2: gcc.libstdc++-v3.python.dot.fix.patch --]
[-- Type: application/octet-stream, Size: 1980 bytes --]
Index: libstdc++-v3/ChangeLog
===================================================================
--- libstdc++-v3/ChangeLog (revision 225409)
+++ libstdc++-v3/ChangeLog (working copy)
@@ -1,3 +1,9 @@
+2015-07-03 Michael Darling <darlingm@gmail.com>
+
+ * python/Makefile.am: python script name based off libstdc++.* rather
+ than libstdc++*, to avoid being mis-named after libstdc++fs.
+ * python/Makefile.in: Regenerate.
+
2015-07-03 Jonathan Wakely <jwakely@redhat.com>
* doc/xml/manual/status_cxx2017.xml: Update status table.
Index: libstdc++-v3/python/Makefile.am
===================================================================
--- libstdc++-v3/python/Makefile.am (revision 225409)
+++ libstdc++-v3/python/Makefile.am (working copy)
@@ -45,11 +45,11 @@
@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
## We want to install gdb.py as SOMETHING-gdb.py. SOMETHING is the
## full name of the final library. We want to ignore symlinks, the
-## .la file, and any previous -gdb.py file. This is inherently
-## fragile, but there does not seem to be a better option, because
-## libtool hides the real names from us.
+## .la file, any previous -gdb.py file, and libstdc++fs*. This is
+## inherently fragile, but there does not seem to be a better option,
+## because libtool hides the real names from us.
@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
- for file in libstdc++*; do \
+ for file in libstdc++.*; do \
case $$file in \
*-gdb.py) ;; \
*.la) ;; \
Index: libstdc++-v3/python/Makefile.in
===================================================================
--- libstdc++-v3/python/Makefile.in (revision 225409)
+++ libstdc++-v3/python/Makefile.in (working copy)
@@ -547,7 +547,7 @@
install-data-local: gdb.py
@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
- for file in libstdc++*; do \
+ for file in libstdc++.*; do \
case $$file in \
*-gdb.py) ;; \
*.la) ;; \
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fixes accidental renaming of gdb.py file (i.e. libstdc++.so.6.0.22-gdb.py)
2015-07-17 0:57 ` Michael Darling
@ 2016-08-31 14:52 ` Gerald Pfeifer
2016-08-31 15:03 ` Jonathan Wakely
0 siblings, 1 reply; 4+ messages in thread
From: Gerald Pfeifer @ 2016-08-31 14:52 UTC (permalink / raw)
To: Michael Darling, libstdc++; +Cc: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 3866 bytes --]
Michael,
I noticed you did not copy the libstc++ list, so let me do this
for you. (If any further ping is necessary, please include that
list.)
Jonathan, if you approve, Michael does not have commit access.
Gerald
On Thu, 16 Jul 2015, Michael Darling wrote:
> Ping. I don't have write access.
>
> The attached patch still works with current trunk source, only failing
> on the ChangeLog due to submissions since then.
>
> On Fri, Jul 3, 2015 at 9:50 PM, Michael Darling <darlingm@gmail.com> wrote:
>> The addition of libstdc++fs broke an inexact and fragile method in the
>> libstdc++-v3/python makefile, so it mis-names a python script after
>> libstdc++fs rather than libstdc++.
>>
>> With DESTDIR /usr/lib, toolexeclibdir ../lib, and the .so version of
>> 6.0.21, this makefile used to install the python script to
>> /usr/lib/libstdc++.so.6.0.21-gdb.py.
>>
>> Once libstdc++fs was added, this makefile installs the python script
>> to /usr/lib/libstdc++fs.a-gdb.py.
>>
>> This makefile examines files named libstdc++* in
>> DESTDIR/toolexeclibdir, excluding: symlinks; *.la files; and previous
>> *-gdb.py files. Its comments report it is done this way because
>> "libtool hides the real names from us".
>>
>> This patch changes the makefile so it examines files named libstdc++.*
>> (notice the addition of the dot.) Although this is still not an
>> optimum method, it at least puts the makefile on the right track
>> again. Adding the dot is more future-proof than excluding files
>> starting with libstdc++fs, because of the possibility of future
>> additions of similarly named libraries.
>>
>> The patch below is also an attachment to this email.
>>
>>
>>
>> Index: libstdc++-v3/ChangeLog
>> ===================================================================
>> --- libstdc++-v3/ChangeLog (revision 225409)
>> +++ libstdc++-v3/ChangeLog (working copy)
>> @@ -1,3 +1,9 @@
>> +2015-07-03 Michael Darling <darlingm@gmail.com>
>> +
>> + * python/Makefile.am: python script name based off libstdc++.* rather
>> + than libstdc++*, to avoid being mis-named after libstdc++fs.
>> + * python/Makefile.in: Regenerate.
>> +
>> 2015-07-03 Jonathan Wakely <jwakely@redhat.com>
>>
>> * doc/xml/manual/status_cxx2017.xml: Update status table.
>> Index: libstdc++-v3/python/Makefile.am
>> ===================================================================
>> --- libstdc++-v3/python/Makefile.am (revision 225409)
>> +++ libstdc++-v3/python/Makefile.am (working copy)
>> @@ -45,11 +45,11 @@
>> @$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
>> ## We want to install gdb.py as SOMETHING-gdb.py. SOMETHING is the
>> ## full name of the final library. We want to ignore symlinks, the
>> -## .la file, and any previous -gdb.py file. This is inherently
>> -## fragile, but there does not seem to be a better option, because
>> -## libtool hides the real names from us.
>> +## .la file, any previous -gdb.py file, and libstdc++fs*. This is
>> +## inherently fragile, but there does not seem to be a better option,
>> +## because libtool hides the real names from us.
>> @here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
>> - for file in libstdc++*; do \
>> + for file in libstdc++.*; do \
>> case $$file in \
>> *-gdb.py) ;; \
>> *.la) ;; \
>> Index: libstdc++-v3/python/Makefile.in
>> ===================================================================
>> --- libstdc++-v3/python/Makefile.in (revision 225409)
>> +++ libstdc++-v3/python/Makefile.in (working copy)
>> @@ -547,7 +547,7 @@
>> install-data-local: gdb.py
>> @$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
>> @here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
>> - for file in libstdc++*; do \
>> + for file in libstdc++.*; do \
>> case $$file in \
>> *-gdb.py) ;; \
>> *.la) ;; \
[-- Attachment #2: Type: application/octet-stream, Size: 1980 bytes --]
Index: libstdc++-v3/ChangeLog
===================================================================
--- libstdc++-v3/ChangeLog (revision 225409)
+++ libstdc++-v3/ChangeLog (working copy)
@@ -1,3 +1,9 @@
+2015-07-03 Michael Darling <darlingm@gmail.com>
+
+ * python/Makefile.am: python script name based off libstdc++.* rather
+ than libstdc++*, to avoid being mis-named after libstdc++fs.
+ * python/Makefile.in: Regenerate.
+
2015-07-03 Jonathan Wakely <jwakely@redhat.com>
* doc/xml/manual/status_cxx2017.xml: Update status table.
Index: libstdc++-v3/python/Makefile.am
===================================================================
--- libstdc++-v3/python/Makefile.am (revision 225409)
+++ libstdc++-v3/python/Makefile.am (working copy)
@@ -45,11 +45,11 @@
@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
## We want to install gdb.py as SOMETHING-gdb.py. SOMETHING is the
## full name of the final library. We want to ignore symlinks, the
-## .la file, and any previous -gdb.py file. This is inherently
-## fragile, but there does not seem to be a better option, because
-## libtool hides the real names from us.
+## .la file, any previous -gdb.py file, and libstdc++fs*. This is
+## inherently fragile, but there does not seem to be a better option,
+## because libtool hides the real names from us.
@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
- for file in libstdc++*; do \
+ for file in libstdc++.*; do \
case $$file in \
*-gdb.py) ;; \
*.la) ;; \
Index: libstdc++-v3/python/Makefile.in
===================================================================
--- libstdc++-v3/python/Makefile.in (revision 225409)
+++ libstdc++-v3/python/Makefile.in (working copy)
@@ -547,7 +547,7 @@
install-data-local: gdb.py
@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
- for file in libstdc++*; do \
+ for file in libstdc++.*; do \
case $$file in \
*-gdb.py) ;; \
*.la) ;; \
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fixes accidental renaming of gdb.py file (i.e. libstdc++.so.6.0.22-gdb.py)
2016-08-31 14:52 ` Gerald Pfeifer
@ 2016-08-31 15:03 ` Jonathan Wakely
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Wakely @ 2016-08-31 15:03 UTC (permalink / raw)
To: Gerald Pfeifer; +Cc: Michael Darling, libstdc++, gcc-patches
On 31/08/16 16:52 +0200, Gerald Pfeifer wrote:
>Michael,
>
>I noticed you did not copy the libstc++ list, so let me do this
>for you. (If any further ping is necessary, please include that
>list.)
Thanks, Gerald.
>Jonathan, if you approve, Michael does not have commit access.
I found the problem myself and fixed it exactly the same way with
https://gcc.gnu.org/r227030 (with a mangled changelog sadly).
>
>Gerald
>
>On Thu, 16 Jul 2015, Michael Darling wrote:
>> Ping. I don't have write access.
>>
>> The attached patch still works with current trunk source, only failing
>> on the ChangeLog due to submissions since then.
N.B. The usual solution to that problem is to send the ChangeLog entry
separately (either as a separate attachment, or inline in the email
body) not as part of the patch.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-31 15:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-04 1:50 [PATCH] Fixes accidental renaming of gdb.py file (i.e. libstdc++.so.6.0.22-gdb.py) Michael Darling
2015-07-17 0:57 ` Michael Darling
2016-08-31 14:52 ` Gerald Pfeifer
2016-08-31 15:03 ` Jonathan Wakely
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).