diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2015-11-19 04:44:00 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-11-19 04:44:02 +1100 |
| commit | edc5db6221dae6af6ddbea71ae9b36756e634f1f (patch) | |
| tree | da8507bbdd2213731830e4e12f7f2084533a9b9b | |
| parent | 8294f8afba1433e3bc26498a67bed2884d8b7fee (diff) | |
| download | kde-edc5db6221dae6af6ddbea71ae9b36756e634f1f.tar.gz kde-edc5db6221dae6af6ddbea71ae9b36756e634f1f.tar.bz2 kde-edc5db6221dae6af6ddbea71ae9b36756e634f1f.zip | |
cmake-utils.eclass: don't warn about deprecated usage when not defined
| -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 2b858ccb1db..df7d643542f 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -573,8 +573,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[@]}") |