Skip to contentSkip to conversation

gcc: Package libstdc++ gdb python helpers into dev package

PATCH In review Khem Raj 4 participants 6 messages Jun 9, 2011 – Jul 23, 2011

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 gcc: Package libstdc++ gdb python helpers into dev package

People are seeing these errrors from ldconfig libstdc++.so.6.0.14-gdb.py is not an ELF file - it has the wrong magic bytes at the start.

this file is moved into gdb's autoload directory if it exists there then gdb will find it when debugging and it wont be in the paths where ldconfig looks for libraries.

---
 recipes/gcc/gcc-4.5.inc            |    2 +-
 recipes/gcc/gcc-package-cross.inc  |    8 +++++++-
 recipes/gcc/gcc-package-target.inc |    4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)
recipes/gcc/gcc-4.5.inc +1 -1
index aa5bb00..69229ef 100644
@@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf"
 NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
 
 
-INC_PR = "r36"
+INC_PR = "r37"
 
 SRCREV = "170880"
 PV = "4.5"
recipes/gcc/gcc-package-cross.inc +7 -1
index f9a7eeb..1533069 100644
@@ -4,7 +4,7 @@ PACKAGE_STRIP = "no"
 
 SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs"
 
-PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran"
+PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran libstdc++-dev libgcc-dev"
 
 # Called from within gcc-cross, so libdir is set wrong
 FILES_libg2c = "${target_libdir}/libg2c.so.*"
@@ -18,6 +18,7 @@ FILES_libgcc-dev = "${target_libdir}/libgcc_s.so"
 
 FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
 
+FILES_libstdc++-dev = "${target_datadir}/gdb/auto-load/${libdir}/libstdc++.so.*-gdb.py*"
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}${target_base_libdir}
@@ -68,5 +69,10 @@ GROUP ( libgcc_s.so.1 libgcc.a )" > ${D}${target_libdir}/libgcc_s.so
 	# We use libiberty from binutils or binutils-cross
 	rm -f ${D}${libdir}/libiberty.a
 	rm -f ${D}${target_libdir}/libiberty.a
+	if [ -f ${D}${target_libdir}/libstdc++.so.*-gdb.py ]; then
+		# move the gdb python helpers to gdb auto-load directory
+		install -d ${D}${target_datadir}/gdb/auto-load${target_libdir}
+		mv -f ${D}${target_libdir}/libstdc++.so.*-gdb.py* ${D}${target_datadir}/gdb/auto-load${target_libdir}
+	fi
 }
 
recipes/gcc/gcc-package-target.inc +4 -0
index 5cfe47b..959b9ec 100644
@@ -83,6 +83,7 @@ FILES_libstdc++-dev = "\
   ${libdir}/libsupc++.la \
   ${libdir}/libsupc++.a \
 "
+FILES_libstdc++-dev += "${datadir}/gdb/auto-load/${libdir}/libstdc++.so.*-gdb.py*"
 
 FILES_libgfortran-dev = "${libdir}/libgfortran.a \
                          ${libdir}/libgfortran.so \
@@ -168,4 +169,7 @@ GROUP ( libgcc_s.so.1 libgcc.a )" > ${D}${libdir}/libgcc_s.so
 
 	# Remove precompiled c++ headers as they are really big
 	rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_SYS}/bits/*.gch
+	# move the gdb python helpers to gdb auto-load directory
+	install -d ${D}${datadir}/gdb/auto-load/${libdir}
+	mv ${D}${libdir}/libstdc++.so.*-gdb.py* ${D}${datadir}/gdb/auto-load${libdir}
 }
Signature · 1 line
1.7.0.4
Tested-by on v1 1/1
#1 lore raw
Quoted 10 lines · Khem Raj

People are seeing these errrors from ldconfig libstdc++.so.6.0.14-gdb.py is not an ELF file - it has the wrong magic bytes at the start.

this file is moved into gdb's autoload directory if it exists there then gdb will find it when debugging and it wont be in the paths where ldconfig looks for libraries.

Finally,

No more annoying message when I run ldconfig. Getting this fix in will reduce my support emails by a small, but noticeable amount.

Philip

Quoted 71 lines
---
  recipes/gcc/gcc-4.5.inc            |    2 +-
  recipes/gcc/gcc-package-cross.inc  |    8 +++++++-
  recipes/gcc/gcc-package-target.inc |    4 ++++
  3 files changed, 12 insertions(+), 2 deletions(-)
recipes/gcc/gcc-4.5.inc +1 -1
index aa5bb00..69229ef 100644
@@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf"
  NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
 
 
-INC_PR = "r36"
+INC_PR = "r37"
 
  SRCREV = "170880"
  PV = "4.5"
recipes/gcc/gcc-package-cross.inc +7 -1
index f9a7eeb..1533069 100644
@@ -4,7 +4,7 @@ PACKAGE_STRIP = "no"
 
  SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs"
 
-PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran"
+PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran libstdc++-dev libgcc-dev"
 
  # Called from within gcc-cross, so libdir is set wrong
  FILES_libg2c = "${target_libdir}/libg2c.so.*"
@@ -18,6 +18,7 @@ FILES_libgcc-dev = "${target_libdir}/libgcc_s.so"
 
  FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
 
+FILES_libstdc++-dev = "${target_datadir}/gdb/auto-load/${libdir}/libstdc++.so.*-gdb.py*"
  do_install () {
  	oe_runmake 'DESTDIR=${D}' install
  	install -d ${D}${target_base_libdir}
@@ -68,5 +69,10 @@ GROUP ( libgcc_s.so.1 libgcc.a )">  ${D}${target_libdir}/libgcc_s.so
  	# We use libiberty from binutils or binutils-cross
  	rm -f ${D}${libdir}/libiberty.a
  	rm -f ${D}${target_libdir}/libiberty.a
+	if [ -f ${D}${target_libdir}/libstdc++.so.*-gdb.py ]; then
+		# move the gdb python helpers to gdb auto-load directory
+		install -d ${D}${target_datadir}/gdb/auto-load${target_libdir}
+		mv -f ${D}${target_libdir}/libstdc++.so.*-gdb.py* ${D}${target_datadir}/gdb/auto-load${target_libdir}
+	fi
  }
 
recipes/gcc/gcc-package-target.inc +4 -0
index 5cfe47b..959b9ec 100644
@@ -83,6 +83,7 @@ FILES_libstdc++-dev = "\
    ${libdir}/libsupc++.la \
    ${libdir}/libsupc++.a \
  "
+FILES_libstdc++-dev += "${datadir}/gdb/auto-load/${libdir}/libstdc++.so.*-gdb.py*"
 
  FILES_libgfortran-dev = "${libdir}/libgfortran.a \
                           ${libdir}/libgfortran.so \
@@ -168,4 +169,7 @@ GROUP ( libgcc_s.so.1 libgcc.a )">  ${D}${libdir}/libgcc_s.so
 
  	# Remove precompiled c++ headers as they are really big
  	rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_SYS}/bits/*.gch
+	# move the gdb python helpers to gdb auto-load directory
+	install -d ${D}${datadir}/gdb/auto-load/${libdir}
+	mv ${D}${libdir}/libstdc++.so.*-gdb.py* ${D}${datadir}/gdb/auto-load${libdir}
  }
author
#2 lore raw
Quoted 10 lines · Philip Balister
Quoted 9 lines · Khem Raj

People are seeing these errrors from ldconfig libstdc++.so.6.0.14-gdb.py is not an ELF file - it has the wrong magic bytes at the start.

this file is moved into gdb's autoload directory if it exists there then gdb will find it when debugging and it wont be in the paths where ldconfig looks for libraries.

Quoted 8 lines
Quoted 1 line

Finally,

No more annoying message when I run ldconfig. Getting this fix in will reduce my support emails by a small, but noticeable amount.

thanks for testing it out. I have installed in in oe.dev/master

-Khem

#3 lore raw
Quoted 10 lines · Khem Raj
Quoted 7 lines · Philip Balister
Quoted 3 lines · Khem Raj

People are seeing these errrors from ldconfig libstdc++.so.6.0.14-gdb.py is not an ELF file - it has the wrong magic bytes at the start.

No more annoying message when I run ldconfig. Getting this fix in will reduce my support emails by a small, but noticeable amount.

thanks for testing it out. I have installed in in oe.dev/master

Would it be worth a cherry-pick of this into 2011.03-maintenance? I've been seeing it there with gcc 4.4.4, too, and have the same issue with questions that pop up about it.

Thanks,
Chris

#4 lore raw
Quoted 7 lines · Chris Verges
Quoted 6 lines · Khem Raj
Quoted 5 lines · Philip Balister
Quoted 3 lines · Khem Raj

People are seeing these errrors from ldconfig libstdc++.so.6.0.14-gdb.py is not an ELF file - it has the wrong magic bytes at the start.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

No more annoying message when I run ldconfig. Getting this fix in will reduce my support emails by a small, but noticeable amount.

thanks for testing it out. I have installed in in oe.dev/master

Would it be worth a cherry-pick of this into 2011.03-maintenance? I've been seeing it there with gcc 4.4.4, too, and have the same issue with questions that pop up about it.

I'm going to look at this "soon".

Philip

#5 lore raw
In reply to Chris Verges

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 23-07-11 17:09, Chris Verges schreef:

Quoted 10 lines · Khem Raj
Quoted 7 lines · Philip Balister
Quoted 4 lines · Khem Raj
Quoted 1 line

People are seeing these errrors from ldconfig libstdc++.so.6.0.14-gdb.py is not an ELF file - it has the wrong magic bytes at the start.

No more annoying message when I run ldconfig. Getting this fix in will reduce my support emails by a small, but noticeable amount.

thanks for testing it out. I have installed in in oe.dev/master

Would it be worth a cherry-pick of this into 2011.03-maintenance? I've been seeing it there with gcc 4.4.4, too, and have the same issue with questions that pop up about it.

I've already cherry-picked it and will send a pull request after Tom applies my previous one. Likely after the weekend. -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOKw/PMkyGM64RGpERApWRAJ93vxrpac0kZ5RcyRIIcms/jSW1XwCfdplH NJAt+VjSEYEwiRt2fQBpyX0=
=IpRi
-----END PGP SIGNATURE-----