diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-10-03 19:48:00 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-10-03 19:48:00 +0000 |
| commit | 424a320d67f089a67a9656b9066d9c09add59410 (patch) | |
| tree | 6ae97ec80323b27f50e6c4418d53ab8d4446c670 /sys-devel | |
| parent | add function for creating gcc env.d entries (diff) | |
| download | gentoo-2-424a320d67f089a67a9656b9066d9c09add59410.tar.gz gentoo-2-424a320d67f089a67a9656b9066d9c09add59410.tar.bz2 gentoo-2-424a320d67f089a67a9656b9066d9c09add59410.zip | |
use create_gcc_env_entry from toolchain.eclass to create gcc-config entries for using the hardened/vanilla specs files
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.4.2-r2.ebuild | 25 |
2 files changed, 10 insertions, 21 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 0251ccd1d24a..0dd1e39adb32 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/gcc # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.332 2004/09/25 18:51:38 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.333 2004/10/03 19:48:00 lv Exp $ + + 03 Oct 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.2-r2.ebuild: + use create_gcc_env_entry from toolchain.eclass to create gcc-config entries + for using the hardened/vanilla specs files 25 Sep 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.3-r3.ebuild, gcc-3.3.3-r5.ebuild, gcc-3.3.3-r6.ebuild, gcc-3.3.4-r1.ebuild, diff --git a/sys-devel/gcc/gcc-3.4.2-r2.ebuild b/sys-devel/gcc/gcc-3.4.2-r2.ebuild index 00031a131e83..8a3e9415c1f6 100644 --- a/sys-devel/gcc/gcc-3.4.2-r2.ebuild +++ b/sys-devel/gcc/gcc-3.4.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.2-r2.ebuild,v 1.4 2004/09/28 22:56:54 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.2-r2.ebuild,v 1.5 2004/10/03 19:48:00 lv Exp $ IUSE="static nls bootstrap build nomultilib gcj gtk f77 objc hardened uclibc n32 n64" @@ -216,28 +216,13 @@ src_install() { dodir /lib /usr/bin dodir /etc/env.d/gcc - echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - - # The LDPATH stuff is kinda iffy now that we need to provide compatibility - # with older versions of GCC for binary apps. - if use !nomultilib && [ "${ARCH}" = "amd64" ] - then - # amd64 is a bit unique because of multilib. Add some other paths - LDPATH="${LIBPATH}:${LIBPATH}/32" + create_gcc_env_entry || die + if use hardened ; then + create_gcc_env_entry vanilla || die else - LDPATH="${LIBPATH}" + create_gcc_env_entry hardened || die fi - echo "LDPATH=\"${LDPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - - echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - # Also set CC and CXX - echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL} - # Make sure we dont have stuff lying around that # can nuke multiple versions of gcc if ! use build |