diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-01-08 13:39:47 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-01-08 13:43:19 +0100 |
| commit | 07f51c3d74c5387d581a95be90985a80c2155481 (patch) | |
| tree | fda9c4c7510ad3f4ae3282af657f989d377df49c | |
| parent | sys-libs/kpmcore: drop 21.12.1* (diff) | |
| download | kde-07f51c3d.tar.gz kde-07f51c3d.tar.bz2 kde-07f51c3d.zip | |
ecm.eclass: Fix sed typo in _ecm_punt_kfqt_module()
But also add '${dep}' info to 'removed by ecm.eclass' output.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/ecm.eclass | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 148a59369c..a0ba4090ce 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -335,11 +335,10 @@ _ecm_punt_kfqt_module() { local first=$(head -n 1 "${T}/bogus${dep}" | cut -d ":" -f 1) local last=$(( length + first - 1)) - # FIXME: may leave empty find_package($prefix) behind (no regression, non-trivial) sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die if [[ ${length} -eq 1 ]] ; then - sed -e "/find_package\s*(\s*${prefix}\([0-9]|\${[A-Z0-9_]*}\)\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# removed by ecm.eclass - /" \ + sed -e "/find_package\s*(\s*${prefix}\([0-9]\|\${[A-Z0-9_]*}\)\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# '${dep}' removed by ecm.eclass - /" \ -i CMakeLists.txt || die fi } |