commit:     cf493d5dcedbf1df2e73c495ed9c067480325323
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 14:23:36 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 14:23:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cf493d5d

cmake.eclass: src_configure: Make sure mycmakeargs is initialised at all

Closes: https://bugs.gentoo.org/703638
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/cmake.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 20ba229377..834df7f4c3 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -492,8 +492,9 @@ cmake_src_configure() {
                _EOF_
        fi
 
-       # Make the array a local variable since <=portage-2.1.6.x does not
-       # support global arrays (see bug #297255).
+       # Make the array a local variable since <=portage-2.1.6.x does not 
support
+       # global arrays (see bug #297255). But first make sure it is 
initialised.
+       [[ -z ${mycmakeargs} ]] && declare -a mycmakeargs=()
        local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
        if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
                die "mycmakeargs must be declared as array"

Reply via email to