summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-01-26 01:04:13 +1100
committerMichael Palimaka <kensington@gentoo.org>2016-01-26 01:07:06 +1100
commitfc25e35719a122316225974891f5a5837cdbfda9 (patch)
treeec6c65f494b055232ff1d77a012444d0531a8e7e /eclass
parentcmake-utils.eclass: move $S modifications to src_prepare in EAPI 6 and later (diff)
downloadgentoo-fc25e35719a122316225974891f5a5837cdbfda9.tar.gz
gentoo-fc25e35719a122316225974891f5a5837cdbfda9.tar.bz2
gentoo-fc25e35719a122316225974891f5a5837cdbfda9.zip
cmake-utils.eclass: ban non-array usage of mycmakeargs in EAPI 6 and later
Diffstat (limited to 'eclass')
-rw-r--r--eclass/cmake-utils.eclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 9f79584fe2e3..7480a1496ce3 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -583,7 +583,11 @@ enable_cmake-utils_src_configure() {
local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
if [[ -n "${mycmakeargstype}" ]] ; then
- eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+ if has "${EAPI:-0}" 2 3 4 5 ; then
+ eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
+ else
+ die "Declaring mycmakeargs as a variable is banned in EAPI=${EAPI}. Please use an array instead."
+ fi
fi
local mycmakeargs_local=(${mycmakeargs})
else