commit:     49a24b22df3641af3d87c5b546ae14b099ed9ae2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 21:23:18 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 12:19:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=49a24b22

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 <AT> gentoo.org>

 eclass/cmake.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 65a7664226..6227785dc9 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}"

Reply via email to