diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-11-19 04:44:00 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-12-16 00:32:17 +1100 |
| commit | 4dbf75308e2ee9775fe45272007e1ae18eca718c (patch) | |
| tree | f386409b70e68830c3cd2338fd269addb447ed58 /eclass/cmake-utils.eclass | |
| parent | media-libs/phonon: add patch by Ryan Hill <rhill@gentoo.org> to fix build wit... (diff) | |
| download | gentoo-4dbf75308e2ee9775fe45272007e1ae18eca718c.tar.gz gentoo-4dbf75308e2ee9775fe45272007e1ae18eca718c.tar.bz2 gentoo-4dbf75308e2ee9775fe45272007e1ae18eca718c.zip | |
cmake-utils.eclass: don't warn about deprecated usage when not defined
Diffstat (limited to 'eclass/cmake-utils.eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 7 |
1 files changed, 5 insertions, 2 deletions
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[@]}") |