diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-03 22:23:18 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-04 13:19:17 +0100 |
| commit | 49a24b22df3641af3d87c5b546ae14b099ed9ae2 (patch) | |
| tree | c3b50d98c47169fd6f6b0157f64b7a4e70751fa6 | |
| parent | 23bc7197cc2377e86efaf8a9d7f67f4a6d703d90 (diff) | |
| download | kde-49a24b22df3641af3d87c5b546ae14b099ed9ae2.tar.gz kde-49a24b22df3641af3d87c5b546ae14b099ed9ae2.tar.bz2 kde-49a24b22df3641af3d87c5b546ae14b099ed9ae2.zip | |
cmake.eclass: src_prepare: Revert to cmake-utils.eclass behaviour
Re-adding pushd/popd until we figure out how to make it consistent
across the eclass.
Bug: https://bugs.gentoo.org/704524
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/cmake.eclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 65a76642262..6227785dc97 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -294,6 +294,8 @@ _cmake_modify-cmakelists() { cmake_src_prepare() { debug-print-function ${FUNCNAME} "$@" + pushd "${S}" > /dev/null || die + default_src_prepare _cmake_check_build_dir @@ -327,6 +329,8 @@ cmake_src_prepare() { # Remove dangerous things. _cmake_modify-cmakelists + popd > /dev/null || die + # make ${S} read-only in order to detect broken build-systems if [[ ${CMAKE_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then chmod -R a-w "${S}" |