Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Sun, 30 Aug 2020 19:02:28
Message-Id: 1598811012.7f989409cf6d8916c7f521de8bba0ac03a86f92a.asturm@gentoo
1 commit: 7f989409cf6d8916c7f521de8bba0ac03a86f92a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 30 18:05:31 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 18:10:12 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f989409
7
8 cmake.eclass: If inherited from ecm.eclass, set ECM_DISABLE_QMLPLUGINDUMP
9
10 Works with downstream patch added to kde-frameworks/extra-cmake-modules in
11 commit f5b2cf80ea9696a5efbc2064cd432670670af486
12
13 Bug: https://bugs.gentoo.org/640432
14 Bug: https://bugs.gentoo.org/683102
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 eclass/cmake.eclass | 4 ++++
18 1 file changed, 4 insertions(+)
19
20 diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
21 index d9fb203ede..f04888f187 100644
22 --- a/eclass/cmake.eclass
23 +++ b/eclass/cmake.eclass
24 @@ -489,6 +489,10 @@ cmake_src_configure() {
25 SET (BUILD_SHARED_LIBS ON CACHE BOOL "")
26 _EOF_
27
28 + if [[ -n ${_ECM_ECLASS} ]]; then
29 + echo 'SET (ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")' >> "${common_config}" || die
30 + fi
31 +
32 # See bug 689410
33 if [[ "${ARCH}" == riscv ]]; then
34 echo 'SET (CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die