diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-07-12 03:58:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-07-12 03:58:11 +0000 |
| commit | b84de52e535917778cdee0ba413569df73993265 (patch) | |
| tree | b89710ced3b1a45f1ddde773f7f9986e910b07c7 | |
| parent | Convert from old `test_flag` to new `test-flag`. (diff) | |
| download | historical-b84de52e535917778cdee0ba413569df73993265.tar.gz historical-b84de52e535917778cdee0ba413569df73993265.tar.bz2 historical-b84de52e535917778cdee0ba413569df73993265.zip | |
turn `ewarn` for dead flags into `die`
| -rw-r--r-- | eclass/flag-o-matic.eclass | 78 |
1 files changed, 8 insertions, 70 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 6977d6333c95..3119f3e4ebf7 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.150 2011/02/25 10:51:44 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.151 2011/07/12 03:58:11 vapier Exp $ # @ECLASS: flag-o-matic.eclass # @MAINTAINER: @@ -487,15 +487,6 @@ test-flags-FC() { test-flags-PROG "FC" "$@"; } # its really only present due to the append-flags() abomination. test-flags() { test-flags-CC "$@"; } -# @FUNCTION: test_flag -# @DESCRIPTION: -# DEPRICIATED, use test-flags() -test_flag() { - ewarn "test_flag: deprecated, please use test-flags()!" >&2 - - test-flags-CC "$@" -} - # @FUNCTION: test_version_info # @USAGE: <version> # @DESCRIPTION: @@ -540,66 +531,13 @@ get-flag() { return 1 } -# @FUNCTION: has_hardened -# @DESCRIPTION: -# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs -has_hardened() { - ewarn "has_hardened: deprecated, please use gcc-specs-{relro,now}()!" >&2 - - test_version_info Hardened && return 0 - # The specs file wont exist unless gcc has GCC_SPECS support - [[ -f ${GCC_SPECS} && ${GCC_SPECS} != ${GCC_SPECS/hardened/} ]] -} - -# @FUNCTION: has_pic -# @DESCRIPTION: -# DEPRECATED - use gcc-specs-pie from toolchain-funcs -# indicate whether PIC is set -has_pic() { - ewarn "has_pic: deprecated, please use gcc-specs-pie()!" >&2 - - [[ ${CFLAGS/-fPIC} != ${CFLAGS} || \ - ${CFLAGS/-fpic} != ${CFLAGS} ]] || \ - gcc-specs-pie -} - -# @FUNCTION: has_pie -# @DESCRIPTION: -# DEPRECATED - use gcc-specs-pie from toolchain-funcs -# indicate whether PIE is set -has_pie() { - ewarn "has_pie: deprecated, please use gcc-specs-pie()!" >&2 - - [[ ${CFLAGS/-fPIE} != ${CFLAGS} || \ - ${CFLAGS/-fpie} != ${CFLAGS} ]] || \ - gcc-specs-pie -} - -# @FUNCTION: has_ssp_all -# @DESCRIPTION: -# DEPRECATED - use gcc-specs-ssp from toolchain-funcs -# indicate whether code for SSP is being generated for all functions -has_ssp_all() { - ewarn "has_ssp_all: deprecated, please use gcc-specs-ssp()!" >&2 - - # note; this matches only -fstack-protector-all - [[ ${CFLAGS/-fstack-protector-all} != ${CFLAGS} || \ - -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__) ]] || \ - gcc-specs-ssp-to-all -} - -# @FUNCTION: has_ssp -# @DESCRIPTION: -# DEPRECATED - use gcc-specs-ssp from toolchain-funcs -# indicate whether code for SSP is being generated -has_ssp() { - ewarn "has_ssp: deprecated, please use gcc-specs-ssp()!" >&2 - - # note; this matches both -fstack-protector and -fstack-protector-all - [[ ${CFLAGS/-fstack-protector} != ${CFLAGS} || \ - -n $(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__) ]] || \ - gcc-specs-ssp -} +# DEAD FUNCS. Remove by Dec 2011. +test_flag() { die "$0: deprecated, please use test-flags()!" ; } +has_hardened() { die "$0: deprecated, please use gcc-specs-{relro,now}()!" ; } +has_pic() { die "$0: deprecated, please use gcc-specs-pie()!" ; } +has_pie() { die "$0: deprecated, please use gcc-specs-pie()!" ; } +has_ssp_all() { die "$0: deprecated, please use gcc-specs-ssp()!" ; } +has_ssp() { die "$0: deprecated, please use gcc-specs-ssp()!" ; } # @FUNCTION: has_m64 # @DESCRIPTION: |