1 files changed, 11 insertions, 1 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 64b6168ba7..dbc9141000 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -85,6 +85,8 @@ do_install () {
                 cd ${B}/${TARGET_SYS}/$d/
                 oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/ install
         done
+        install -d ${D}${datadir}/gdb/auto-load/${libdir}
+        mv ${D}${libdir}/libstdc++*-gdb.py ${D}${datadir}/gdb/auto-load/${libdir}
         if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include ]; then
                 install -d ${D}${libdir}/${TARGET_SYS}/${BINV}/include 
                 mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include
@@ -99,6 +101,9 @@ do_install () {
         if [ -d ${D}${infodir} ]; then
                 rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
         fi
+        if [ -d ${D}${libdir} ]; then
+                rmdir --ignore-fail-on-non-empty -p ${D}${libdir}
+        fi
 }
 
 do_install:append:class-target () {
@@ -182,9 +187,14 @@ RRECOMMENDS:${PN}-dbg = ""
 
 # include python debugging scripts
 FILES:${PN}-dbg += "\
-    ${libdir}/libstdc++.*-gdb.py \
     ${datadir}/gcc-${BINV}/python/libstdcxx \
+    ${datadir}/gdb/auto-load \
 "
+# Needed by libstdcxx pretty printer, however it is disabled intentionally
+# as it adds build time dependency on bash and some cases e.g. no GPL3 cases
+# bash is not availbale and builds fails
+# So it needs to be added manually to images sadly.
+# RDEPENDS:${PN}-dbg += "python3-datetime"
 
 FILES:libg2c = "${target_libdir}/libg2c.so.*"
 SUMMARY:libg2c = "Companion runtime library for g77"