[patch] Prevents erasing cmake args by accident

eclass.diff (text/plain), 1.43 KB, created by Lamarque V. Souza on 2010-06-26 18:42:46 UTC

diff -Nru a/cmake-utils.eclass b/cmake-utils.eclass
--- a/cmake-utils.eclass	2010-02-19 00:23:59.000000000 -0200
+++ b/cmake-utils.eclass	2010-02-19 00:23:35.000000000 -0200
@@ -314,7 +314,9 @@
 	# 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
+	# Lamarque 28/01/2010: acrescentei segunda condicao do if para evitar erro # na pessagem de parâmetros para o kdelibs.
+	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]] &&
+	   [[ $(declare -p mycmakeargs 2>&-) != "declare -ax mycmakeargs="* ]]; then
 		local mycmakeargs_local=(${mycmakeargs})
 	else
 		local mycmakeargs_local=("${mycmakeargs[@]}")
diff -Nru a/kde4-base.eclass b/kde4-base.eclass
--- a/kde4-base.eclass	2010-02-19 00:24:07.000000000 -0200
+++ b/kde4-base.eclass	2010-02-19 00:23:30.000000000 -0200
@@ -607,7 +607,9 @@
 		cmakeargs+=(-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc)
 	fi
 
-	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
+	# Lamarque 28/01/2010: acrescentei segunda condicao do if para evitar erro # na pessagem de parâmetros para o kdelibs.
+	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]] &&
+	   [[ $(declare -p mycmakeargs 2>&-) != "declare -ax mycmakeargs="* ]]; then
 		mycmakeargs=(${mycmakeargs})
 	fi