| 1 |
commit: 23858329a86af6548aedb63bb6afd6de2038c07d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 2 18:30:50 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 2 18:30:50 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=23858329 |
| 7 |
|
| 8 |
cmake-utils.eclass: Use xdg_environment_reset from xdg-utils.eclass |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/639460 |
| 11 |
|
| 12 |
eclass/cmake-utils.eclass | 4 ++-- |
| 13 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 16 |
index 28b29eb3f0..7b12a6e7d7 100644 |
| 17 |
--- a/eclass/cmake-utils.eclass |
| 18 |
+++ b/eclass/cmake-utils.eclass |
| 19 |
@@ -110,7 +110,7 @@ case ${EAPI} in |
| 20 |
esac |
| 21 |
|
| 22 |
inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \ |
| 23 |
- multiprocessing versionator |
| 24 |
+ multiprocessing versionator xdg-utils |
| 25 |
|
| 26 |
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install |
| 27 |
|
| 28 |
@@ -491,7 +491,7 @@ cmake-utils_src_configure() { |
| 29 |
_cmake_check_build_dir |
| 30 |
|
| 31 |
# Fix xdg collision with sandbox |
| 32 |
- local -x XDG_CONFIG_HOME="${T}" |
| 33 |
+ xdg_environment_reset |
| 34 |
|
| 35 |
# @SEE CMAKE_BUILD_TYPE |
| 36 |
if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then |
Archives