diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-07-14 03:28:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-14 03:28:12 +0000 |
| commit | 71a05f7d58bbf982e4056d9adc941115bf79f893 (patch) | |
| tree | 0bc06519f31c1aa6673a074786397e332e5c5517 /eclass/toolchain.eclass | |
| parent | alias/flex/gcc updates from Debian and such (diff) | |
| download | historical-71a05f7d58bbf982e4056d9adc941115bf79f893.tar.gz historical-71a05f7d58bbf982e4056d9adc941115bf79f893.tar.bz2 historical-71a05f7d58bbf982e4056d9adc941115bf79f893.zip | |
make sure libc_prefix is set to a sane value in the libc ssp check in case we have multilib/ABI crap turned off
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 0b73ceecc8ed..0594d6f71d86 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.175 2005/07/13 21:06:32 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.176 2005/07/14 03:28:12 vapier Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" @@ -444,8 +444,9 @@ glibc_have_pie() { # smashing protection support. libc_has_ssp() { local libc_prefix - [[ $(tc-arch) == "ppc64" ]] && [[ -z ${ABI} ]] && libc_prefix="/lib64/" - libc_prefix=${libc_prefix:-/$(get_libdir)/} + [[ $(tc-arch) == "ppc64" ]] && [[ -z ${ABI} ]] && libc_prefix="lib64" + libc_prefix=${libc_prefix:-$(get_libdir)} + libc_prefix=${libc_prefix:-lib} echo 'int main(){}' > "${T}"/libctest.c gcc "${T}"/libctest.c -lc -o libctest @@ -461,7 +462,7 @@ libc_has_ssp() { grep 'FUNC.*GLOBAL.*__stack_smash_handler') ]] then return 0 - elif is_crosscompile; then + elif is_crosscompile ; then die "'${my_libc}' was detected w/out ssp, that sucks (a lot)" else return 1 @@ -1551,6 +1552,8 @@ gcc-compiler_src_install() { doexe ${FILESDIR}/fix_libtool_files.sh fi + # use gid of 0 because some stupid ports don't have + # the group 'root' set to gid 0 chown -R root:0 "${D}"${LIBPATH} } |