From: Michael Palimaka Date: Wed, 18 Nov 2015 17:44:00 +0000 (+1100) Subject: cmake-utils.eclass: don't warn about deprecated usage when not defined X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4dbf75308e2ee9775fe45272007e1ae18eca718c;p=gentoo.git cmake-utils.eclass: don't warn about deprecated usage when not defined --- 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[@]}")