From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1135992-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 89089138334
for <garchives@archives.gentoo.org>; Sat, 4 Jan 2020 13:02:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AE100E08BE;
Sat, 4 Jan 2020 13:02:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 97F57E08BE
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jan 2020 13:02:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2B2F834DDFF
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jan 2020 13:02:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 940881E
for <gentoo-commits@lists.gentoo.org>; Sat, 4 Jan 2020 13:02:25 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1578140357.49a24b22df3641af3d87c5b546ae14b099ed9ae2.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
X-VCS-Repository: proj/kde
X-VCS-Files: eclass/cmake.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 49a24b22df3641af3d87c5b546ae14b099ed9ae2
X-VCS-Branch: master
Date: Sat, 4 Jan 2020 13:02:25 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0e7d786d-c1ce-459c-84f5-0b557d23752d
X-Archives-Hash: c281f84ac3f1cb2a3c590bf84bf7263f
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}"