[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     d9e14c7b831181db69599a11d4c27eca5d71c0d3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 14:04:09 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 14:07:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e14c7b

cmake-utils.eclass: declare some variables local

Prevents them from spanning multilibs.

Gentoo-bug: 513170

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

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index ce47086..b0e9bb0 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -449,7 +449,7 @@ enable_cmake-utils_src_configure() {
        _modify-cmakelists
 
        # Fix xdg collision with sandbox
-       export XDG_CONFIG_HOME="${T}"
+       local -x XDG_CONFIG_HOME="${T}"
 
        # @SEE CMAKE_BUILD_TYPE
        if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
@@ -520,7 +520,7 @@ enable_cmake-utils_src_configure() {
                fi
        fi
 
-       has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
+       has "${EAPI:-0}" 0 1 2 && ! use prefix && local EPREFIX=
 
        if [[ ${EPREFIX} ]]; then
                cat >> "${build_rules}" <<- _EOF_ || die