From 4dbf75308e2ee9775fe45272007e1ae18eca718c Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Thu, 19 Nov 2015 04:44:00 +1100 Subject: cmake-utils.eclass: don't warn about deprecated usage when not defined --- eclass/cmake-utils.eclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'eclass/cmake-utils.eclass') diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index fa0ddca92cf5..fd53b3a2bd1d 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -556,8 +556,11 @@ enable_cmake-utils_src_configure() { # Convert mycmakeargs to an array, for backwards compatibility # Make the array a local variable since <=portage-2.1.6.x does not # support global arrays (see bug #297255). - if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then - eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead." + 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." + fi local mycmakeargs_local=(${mycmakeargs}) else local mycmakeargs_local=("${mycmakeargs[@]}") -- cgit v1.2.3-65-gdbad