| 1 |
commit: e960c044f7bcb8f0e9bc16e14cf19a394a456ee2 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 29 16:51:23 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 29 18:44:22 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e960c044 |
| 7 |
|
| 8 |
ecm.eclass: Use new ecm_punt_kf_module/ecm_punt_qt_module internally |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/ecm.eclass | 8 ++++---- |
| 13 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass |
| 16 |
index 9903eeef3e..e173139565 100644 |
| 17 |
--- a/eclass/ecm.eclass |
| 18 |
+++ b/eclass/ecm.eclass |
| 19 |
@@ -429,7 +429,7 @@ ecm_src_prepare() { |
| 20 |
cmake_comment_add_subdirectory ${ECM_HANDBOOK_DIR} |
| 21 |
|
| 22 |
if [[ ${ECM_HANDBOOK} = forceoptional ]] ; then |
| 23 |
- ecm_punt_bogus_dep KF5 DocTools |
| 24 |
+ ecm_punt_kf_module DocTools |
| 25 |
sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die |
| 26 |
fi |
| 27 |
fi |
| 28 |
@@ -454,18 +454,18 @@ ecm_src_prepare() { |
| 29 |
# only build unit tests when required |
| 30 |
if ! { in_iuse test && use test; } ; then |
| 31 |
if [[ ${ECM_TEST} = forceoptional ]] ; then |
| 32 |
- ecm_punt_bogus_dep Qt5 Test |
| 33 |
+ ecm_punt_qt_module Test |
| 34 |
# if forceoptional, also cover non-kde categories |
| 35 |
cmake_comment_add_subdirectory autotests test tests |
| 36 |
elif [[ ${ECM_TEST} = forceoptional-recursive ]] ; then |
| 37 |
- ecm_punt_bogus_dep Qt5 Test |
| 38 |
+ ecm_punt_qt_module Test |
| 39 |
local f pf="${T}/${P}"-tests-optional.patch |
| 40 |
touch ${pf} || die "Failed to touch patch file" |
| 41 |
for f in $(find . -type f -name "CMakeLists.txt" -exec \ |
| 42 |
grep -li "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do |
| 43 |
cp ${f} ${f}.old || die "Failed to prepare patch origfile" |
| 44 |
pushd ${f%/*} > /dev/null || die |
| 45 |
- ecm_punt_bogus_dep Qt5 Test |
| 46 |
+ ecm_punt_qt_module Test |
| 47 |
sed -i CMakeLists.txt -e \ |
| 48 |
"/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/I" \ |
| 49 |
|| die |
Archives