diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-01-07 22:48:01 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-07 22:48:01 +0000 |
| commit | c3bc61051d7f12b4c682efa7a5460bbc8815649e (patch) | |
| tree | b6d19e96ba3c397fb8278eeb9b68170db92630ba /eclass/ecm.eclass | |
| parent | 3517852e3b8a68d1e997770fc0650c5053bafc6c (diff) | |
gentoo resync : 07.01.2022
Diffstat (limited to 'eclass/ecm.eclass')
| -rw-r--r-- | eclass/ecm.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 5ae6e73401ef..baece9e6e637 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -380,7 +380,7 @@ ecm_src_prepare() { if [[ ${ECM_HANDBOOK} = forceoptional ]] ; then ecm_punt_bogus_dep KF5 DocTools - sed -i -e "/kdoctools_install/ s/^/#DONT/" CMakeLists.txt || die + sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die fi fi @@ -412,12 +412,12 @@ ecm_src_prepare() { local f pf="${T}/${P}"-tests-optional.patch touch ${pf} || die "Failed to touch patch file" for f in $(find . -type f -name "CMakeLists.txt" -exec \ - grep -l "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do + grep -li "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do cp ${f} ${f}.old || die "Failed to prepare patch origfile" pushd ${f%/*} > /dev/null || die ecm_punt_bogus_dep Qt5 Test sed -i CMakeLists.txt -e \ - "/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \ + "/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/I" \ || die popd > /dev/null || die diff -Naur ${f}.old ${f} 1>>${pf} |