From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 3FEE1138359 for ; Sun, 30 Aug 2020 19:02:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77186E0AF7; Sun, 30 Aug 2020 19:02:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5BE3EE0AF7 for ; Sun, 30 Aug 2020 19:02:24 +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 5AE81340DE0 for ; Sun, 30 Aug 2020 19:02:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72E01349 for ; Sun, 30 Aug 2020 19:02:19 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1598811012.7f989409cf6d8916c7f521de8bba0ac03a86f92a.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: 7f989409cf6d8916c7f521de8bba0ac03a86f92a X-VCS-Branch: master Date: Sun, 30 Aug 2020 19:02:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 58fcf717-5692-48cc-a514-3b7817833f70 X-Archives-Hash: 1f65139f2fc40cb4539191ea5812212c commit: 7f989409cf6d8916c7f521de8bba0ac03a86f92a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 30 18:05:31 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 30 18:10:12 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f989409 cmake.eclass: If inherited from ecm.eclass, set ECM_DISABLE_QMLPLUGINDUMP Works with downstream patch added to kde-frameworks/extra-cmake-modules in commit f5b2cf80ea9696a5efbc2064cd432670670af486 Bug: https://bugs.gentoo.org/640432 Bug: https://bugs.gentoo.org/683102 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/cmake.eclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index d9fb203ede..f04888f187 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -489,6 +489,10 @@ cmake_src_configure() { SET (BUILD_SHARED_LIBS ON CACHE BOOL "") _EOF_ + if [[ -n ${_ECM_ECLASS} ]]; then + echo 'SET (ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")' >> "${common_config}" || die + fi + # See bug 689410 if [[ "${ARCH}" == riscv ]]; then echo 'SET (CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die