diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-08-16 00:16:12 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-08-16 00:16:12 +0000 |
commit | 0e4611b3eab84f53f6535f5da389c7b98be218af (patch) | |
tree | 7583239b88999fd02c46f84af4828e2ce6a3d0ab /eclass | |
parent | Automated update of use.local.desc (diff) | |
download | historical-0e4611b3eab84f53f6535f5da389c7b98be218af.tar.gz historical-0e4611b3eab84f53f6535f5da389c7b98be218af.tar.bz2 historical-0e4611b3eab84f53f6535f5da389c7b98be218af.zip |
quote ~ when checking unstable arches to avoid home expansion #281311 by Florian Manschwetus
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/flag-o-matic.eclass | 4 | ||||
-rw-r--r-- | eclass/toolchain.eclass | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 4abce864de30..1786a74380fa 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.143 2009/08/15 18:04:08 zmedico 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: @@ -325,7 +325,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 3b935ca15aaa..1e38ea62b2e7 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.404 2009/08/13 18:15:13 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> @@ -390,7 +390,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 @@ -399,7 +399,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 |