Skip to content

Commit 6d0bc89

Browse files
committed
kde-apps/konsole: Revert upstream ccache auto-detection
Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <[email protected]>
1 parent 8ad42e7 commit 6d0bc89

File tree

2 files changed

+49
-1
lines changed

2 files changed

+49
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
From 3529286a0a4885ad3626a4081407fb56a8a568f9 Mon Sep 17 00:00:00 2001
2+
From: Andreas Sturmlechner <[email protected]>
3+
Date: Tue, 24 Mar 2020 00:24:05 +0100
4+
Subject: [PATCH] Revert "CMakeLists.txt: use ccache if present"
5+
6+
This was added for feature-parity with Meson-based projects; but an individual
7+
package is the wrong place for that. To avoid the proliferation of auto-
8+
detected ccache support in kde.org packages please submit such a proposal to
9+
kde-frameworks-devel instead, where it could be added for the benefit of all
10+
the projects using ECM. And more importantly, with a standard switch to disable
11+
it for packaging environments.
12+
13+
This reverts commit 007c2a08523887cf9c0445a288ad82994bd02a57.
14+
15+
Differential Revision: https://phabricator.kde.org/D24805
16+
---
17+
CMakeLists.txt | 12 ------------
18+
1 file changed, 12 deletions(-)
19+
20+
diff --git a/CMakeLists.txt b/CMakeLists.txt
21+
index 17c82b0d..45ab9f62 100644
22+
--- a/CMakeLists.txt
23+
+++ b/CMakeLists.txt
24+
@@ -17,18 +17,6 @@ set (KF5_MIN_VERSION "5.6.0")
25+
# Release script will create bugzilla versions
26+
project(konsole VERSION ${RELEASE_SERVICE_VERSION})
27+
28+
-find_program(CCACHE_FOUND "ccache")
29+
-set(CCACHE_SUPPORT ON CACHE BOOL "Enable ccache support")
30+
-if (CCACHE_FOUND AND CCACHE_SUPPORT)
31+
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" # GNU is GNU GCC
32+
- OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
33+
- # without this compiler messages in `make` backend would be uncolored
34+
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto")
35+
- endif()
36+
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "ccache")
37+
- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "ccache")
38+
-endif()
39+
-
40+
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
41+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
42+
43+
--
44+
2.25.1
45+

kde-apps/konsole/konsole-19.12.3.ebuild

+4-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ DEPEND="
5353
"
5454
RDEPEND="${DEPEND}"
5555

56-
PATCHES=( "${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch" )
56+
PATCHES=(
57+
"${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch"
58+
"${FILESDIR}/${P}-no-ccache.patch"
59+
)
5760

5861
src_configure() {
5962
local mycmakeargs=(

0 commit comments

Comments
 (0)