Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
Date: Wed, 30 Nov 2011 23:54:09
Message-Id: 20111130235357.758AE2004B@flycatcher.gentoo.org
1 vapier 11/11/30 23:53:57
2
3 Modified: toolchain.eclass
4 Log:
5 fix up python libstdc++ helpers: install the core code into the same place as the existing python code, and fix up the pretty printer movers to handle all ABIs and not just the native/32bit
6
7 Revision Changes Path
8 1.483 eclass/toolchain.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.483&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.483&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.482&r2=1.483
13
14 Index: toolchain.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
17 retrieving revision 1.482
18 retrieving revision 1.483
19 diff -u -r1.482 -r1.483
20 --- toolchain.eclass 22 Nov 2011 15:20:48 -0000 1.482
21 +++ toolchain.eclass 30 Nov 2011 23:53:57 -0000 1.483
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2011 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.482 2011/11/22 15:20:48 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.483 2011/11/30 23:53:57 vapier Exp $
27 #
28 # Maintainer: Toolchain Ninjas <toolchain@g.o>
29
30 @@ -973,6 +973,14 @@
31 "${S}"/configure || die
32 fi
33
34 + # install the libstdc++ python into the right location
35 + # http://gcc.gnu.org/PR51368
36 + if tc_version_is_at_least 4.5 ; then
37 + sed -i \
38 + '/^pythondir =/s:=.*:= $(datadir)/python:' \
39 + "${S}"/libstdc++-v3/python/Makefile.in || die
40 + fi
41 +
42 # protoize don't build on FreeBSD, skip it
43 ## removed in 4.5, bug #270558 --de.
44 if [[ ${GCCMAJOR}.${GCCMINOR} < 4.5 ]]; then
45 @@ -1126,10 +1134,10 @@
46 # bug #279252
47 #
48 # --with-python-dir=DIR
49 - # Specifies where to install the Python modules used for aot-compile. DIR
50 + # Specifies where to install the Python modules used for aot-compile. DIR
51 # should not include the prefix used in installation. For example, if the
52 # Python modules are to be installed in /usr/lib/python2.5/site-packages,
53 - # then –with-python-dir=/lib/python2.5/site-packages should be passed.
54 + # then --with-python-dir=/lib/python2.5/site-packages should be passed.
55 #
56 # This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python"
57 if tc_version_is_at_least "4.4" ; then
58 @@ -1825,16 +1833,16 @@
59 chown -R root:0 "${D}"${LIBPATH}
60
61 # Move pretty-printers to gdb datadir to shut ldconfig up
62 - gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/}
63 - for i in "${D}"${LIBPATH}{,/32}/*-gdb.py; do
64 - if [[ -e ${i} ]]; then
65 - basedir="$(dirname ${i/${D}${LIBPATH}/})"
66 - sed -i -e "s:^\(libdir = \).*:\1'${LIBPATH}${basedir}':" "${i}" #348128
67 - insinto "${gdbdir}${basedir}"
68 - doins "${i}"
69 - rm "${i}"
70 - fi
71 + local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/}
72 + pushd "${D}"${LIBPATH} >/dev/null
73 + for py in $(find . -name '*-gdb.py') ; do
74 + local multidir=${py%/*}
75 + insinto "${gdbdir}/${multidir}"
76 + sed -i "/^libdir =/s:=.*:= '${LIBPATH}/${multidir}':" "${py}" || die #348128
77 + doins "${py}" || die
78 + rm "${py}" || die
79 done
80 + popd >/dev/null
81
82 # Don't scan .gox files for executable stacks - false positives
83 export QA_EXECSTACK="usr/lib*/go/*/*.gox"