diff options
| author |   Xake <xake@rymdraket.net> | 2009-08-18 17:55:24 +0200 |
|---|---|---|
| committer | Xake <xake@rymdraket.net> | 2009-08-18 17:55:24 +0200 |
| commit | ece3a54b757d6b480c386408570cf4004c27ba09 (patch) | |
| tree | b3295e30d3659b44da3fe19543aebf53415894e7 | |
| parent | GCC 4.4.1 and GCC 4.3.4 with espf-0.3.3 added (diff) | |
| download | hardened-dev-ece3a54b757d6b480c386408570cf4004c27ba09.tar.gz hardened-dev-ece3a54b757d6b480c386408570cf4004c27ba09.tar.bz2 hardened-dev-ece3a54b757d6b480c386408570cf4004c27ba09.zip | |
Updated eclasses agains portage
| -rw-r--r-- | eclass/flag-o-matic.eclass | 4 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index f6aee72e..6a79b2f4 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.142 2009/07/29 08:32:43 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.144 2009/08/16 00:16:12 vapier Exp $ # @ECLASS: flag-o-matic.eclass # @MAINTAINER: @@ -327,7 +327,7 @@ strip-flags() { local NEW_FCFLAGS="" # Allow unstable C[XX]FLAGS if we are using unstable profile ... - if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then + if has "~$(tc-arch)" ${ACCEPT_KEYWORDS} ; then ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}" fi diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index e6b5447c..20fd64bc 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.403 2009/07/26 20:09:59 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.405 2009/08/16 00:16:12 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -398,7 +398,7 @@ hardened_gcc_works() { want_pie || return 1 hardened_gcc_is_stable pie && return 0 - if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then + if has "~$(tc-arch)" ${ACCEPT_KEYWORDS} ; then hardened_gcc_check_unsupported pie && return 1 ewarn "Allowing pie-by-default for an unstable arch ($(tc-arch))" return 0 @@ -407,7 +407,7 @@ hardened_gcc_works() { elif [[ $1 == "ssp" ]] ; then [[ -z ${PP_VER} ]] && return 1 hardened_gcc_is_stable ssp && return 0 - if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then + if has "~$(tc-arch)" ${ACCEPT_KEYWORDS} ; then hardened_gcc_check_unsupported ssp && return 1 ewarn "Allowing ssp-by-default for an unstable arch ($(tc-arch))" return 0 @@ -1252,6 +1252,12 @@ gcc-compiler-configure() { confgcc="${confgcc} --enable-cld" fi fi + + # Stick the python scripts in their own slotted directory + # bug #279252 + if tc_version_is_at_least "4.4" ; then + confgcc="${confgcc} --with-python-dir=${DATAPATH/$PREFIX/}/python" + fi fi # GTK+ is preferred over xlib in 3.4.x (xlib is unmaintained |