| Upstream-Status: Backport |
| Signed-off-by: Ross Burton <ross.burton@arm.com> |
| |
| From ad4c21f0f59b52357019148ec94d767aa2acd8f2 Mon Sep 17 00:00:00 2001 |
| From: Jonathan Wakely <jwakely@redhat.com> |
| Date: Tue, 1 Jun 2021 11:00:16 +0100 |
| Subject: [PATCH] libstdc++: Fix installation of python hooks [PR 99453] |
| |
| When no shared library is installed, the new code to determine the name |
| of the -gdb.py file yields an empty string. Use the name of the static |
| library in that case. |
| |
| libstdc++-v3/ChangeLog: |
| |
| PR libstdc++/99453 |
| * python/Makefile.am: Use archive name for printer hook if no |
| dynamic library name is available. |
| * python/Makefile.in: Regenerate. |
| |
| (cherry picked from commit 9f7bc160b4a0f27dce248d1226e3ae7104b0e67b) |
| --- |
| libstdc++-v3/python/Makefile.am | 4 ++++ |
| libstdc++-v3/python/Makefile.in | 4 ++++ |
| 2 files changed, 8 insertions(+) |
| |
| diff --git a/libstdc++-v3/python/Makefile.am b/libstdc++-v3/python/Makefile.am |
| index 0c2b207b86e..8efefa5725c 100644 |
| --- a/libstdc++-v3/python/Makefile.am |
| +++ b/libstdc++-v3/python/Makefile.am |
| @@ -48,5 +48,9 @@ install-data-local: gdb.py |
| ## the correct name. |
| @libname=`sed -ne "/^library_names=/{s/.*='//;s/'$$//;s/ .*//;p;}" \ |
| $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \ |
| + if [ -z "$$libname" ]; then \ |
| + libname=`sed -ne "/^old_library=/{s/.*='//;s/'$$//;s/ .*//;p;}" \ |
| + $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \ |
| + fi; \ |
| echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \ |
| $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py |
| diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in |
| index 2efe0b96a19..9904a9197de 100644 |
| --- a/libstdc++-v3/python/Makefile.in |
| +++ b/libstdc++-v3/python/Makefile.in |
| @@ -609,6 +609,10 @@ install-data-local: gdb.py |
| @$(mkdir_p) $(DESTDIR)$(toolexeclibdir) |
| @libname=`sed -ne "/^library_names=/{s/.*='//;s/'$$//;s/ .*//;p;}" \ |
| $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \ |
| + if [ -z "$$libname" ]; then \ |
| + libname=`sed -ne "/^old_library=/{s/.*='//;s/'$$//;s/ .*//;p;}" \ |
| + $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \ |
| + fi; \ |
| echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \ |
| $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py |
| |
| -- |
| 2.25.1 |
| |