Gentoo Archives: gentoo-dev

From: Michael Palimaka <kensington@g.o>
To: gentoo-dev@l.g.o
Cc: Michael Palimaka <kensington@g.o>
Subject: [gentoo-dev] [PATCH 02/15] cmake-utils.eclass: declare some variables local
Date: Wed, 20 Jan 2016 10:45:21
Message-Id: 1453286593-26823-3-git-send-email-kensington@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/15] EAPI 6 support for cmake-utils.eclas by Michael Palimaka
1 Prevents them from spanning multilibs.
2
3 Gentoo-bug: 513170
4 ---
5 eclass/cmake-utils.eclass | 4 ++--
6 1 file changed, 2 insertions(+), 2 deletions(-)
7
8 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
9 index cc4c06b..f361bc7 100644
10 --- a/eclass/cmake-utils.eclass
11 +++ b/eclass/cmake-utils.eclass
12 @@ -449,7 +449,7 @@ enable_cmake-utils_src_configure() {
13 _modify-cmakelists
14
15 # Fix xdg collision with sandbox
16 - export XDG_CONFIG_HOME="${T}"
17 + local -x XDG_CONFIG_HOME="${T}"
18
19 # @SEE CMAKE_BUILD_TYPE
20 if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
21 @@ -520,7 +520,7 @@ enable_cmake-utils_src_configure() {
22 fi
23 fi
24
25 - has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
26 + has "${EAPI:-0}" 0 1 2 && ! use prefix && local EPREFIX=
27
28 if [[ ${EPREFIX} ]]; then
29 cat >> "${build_rules}" <<- _EOF_ || die
30 --
31 2.4.10