summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-06-02 16:40:20 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-06-02 16:40:20 +0000
commitcc053faa80c9385b8412a88ef12fd5373eeabd33 (patch)
tree434b32be6d1a0ce5b88632c9caf903006add2382
parenta4f28f70c356f1f7bb29064a10ba3484d54256a4 (diff)
downloadgcc-49-cc053faa80c9385b8412a88ef12fd5373eeabd33.tar.gz
* Don't install the libstdc++ pretty printer file into the debug directory,
but into the gdb auto-load directory. git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7427 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
-rw-r--r--debian/changelog2
-rw-r--r--debian/rules.d/binary-libstdcxx.mk6
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 4c123f4..dc15980 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ gcc-4.9 (4.9.0-6) UNRELEASED; urgency=medium
* Update to SVN 20140530 (r211080) from the gcc-4_9-branch.
* Fix -Wno-format when -Wformat-security is the default (Steve Beattie).
LP: #1317305.
+ * Don't install the libstdc++ pretty printer file into the debug directory,
+ but into the gdb auto-load directory.
-- Matthias Klose <doko@debian.org> Fri, 30 May 2014 15:34:10 +0200
diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk
index fa1cd8c..97f845a 100644
--- a/debian/rules.d/binary-libstdcxx.mk
+++ b/debian/rules.d/binary-libstdcxx.mk
@@ -122,6 +122,7 @@ dirs_dbg = \
$(docdir) \
$(PF)/lib/debug/$(usr_lib) \
$(usr_lib)/debug \
+ $(PF)/share/gdb/auto-load/$(usr_lib)/debug \
$(gcc_lib_dir)
files_dbg = \
$(usr_lib)/debug/libstdc++.{a,so*}
@@ -423,9 +424,10 @@ endif
$(d_pic)/$(gcc_lib_dir)/libstdc++_pic.map
cp -p $(d)/$(usr_lib)/libstdc++.so.*.py \
- $(d_dbg)/$(PF)/lib/debug/$(usr_lib)/
+ $(d_dbg)/$(PF)/share/gdb/auto-load/$(usr_lib)/debug/.
sed -i -e "/^libdir *=/s,=.*,= '/$(usr_lib)'," \
- $(d_dbg)/$(PF)/lib/debug/$(usr_lib)/libstdc++.so.*.py
+ $(d_dbg)/$(PF)/share/gdb/auto-load/$(usr_lib)/debug/libstdc++.so.*.py
+
ifeq ($(with_libcxx),yes)
cp -a $(d)/$(usr_lib)/libstdc++.so.*[0-9] \
$(d_dbg)/$(usr_lib)/