| 1 |
commit: d3aad02d9011648f04788acfd9672bb8a101b104 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 3 21:23:18 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 3 21:29:52 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3aad02d |
| 7 |
|
| 8 |
cmake.eclass: src_prepare: Revert to cmake-utils.eclass behaviour |
| 9 |
|
| 10 |
Re-adding pushd/popd until we figure out how to make it consistent |
| 11 |
across the eclass. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/704524 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
eclass/cmake.eclass | 4 ++++ |
| 17 |
1 file changed, 4 insertions(+) |
| 18 |
|
| 19 |
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass |
| 20 |
index 93ede2588c8..b2b9ae87961 100644 |
| 21 |
--- a/eclass/cmake.eclass |
| 22 |
+++ b/eclass/cmake.eclass |
| 23 |
@@ -294,6 +294,8 @@ _cmake_modify-cmakelists() { |
| 24 |
cmake_src_prepare() { |
| 25 |
debug-print-function ${FUNCNAME} "$@" |
| 26 |
|
| 27 |
+ pushd "${S}" > /dev/null || die |
| 28 |
+ |
| 29 |
default_src_prepare |
| 30 |
_cmake_check_build_dir |
| 31 |
|
| 32 |
@@ -327,6 +329,8 @@ cmake_src_prepare() { |
| 33 |
# Remove dangerous things. |
| 34 |
_cmake_modify-cmakelists |
| 35 |
|
| 36 |
+ popd > /dev/null || die |
| 37 |
+ |
| 38 |
# make ${S} read-only in order to detect broken build-systems |
| 39 |
if [[ ${CMAKE_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then |
| 40 |
chmod -R a-w "${S}" |
Archives