diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-09-24 23:04:07 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-09-24 23:19:46 +0200 |
| commit | 70409b54aad5815075dad6a1926807baa6b663fa (patch) | |
| tree | 109ac2085f69e4ecf202aeb6084b22a16e0bac19 /eclass/ecm.eclass | |
| parent | cf46932eab834496b00b1b1420ee41b2b0b57b09 (diff) | |
| download | kde-70409b54aad5815075dad6a1926807baa6b663fa.tar.gz kde-70409b54aad5815075dad6a1926807baa6b663fa.tar.bz2 kde-70409b54aad5815075dad6a1926807baa6b663fa.zip | |
ecm.eclass: Switch to pcre2grep, add dev-libs/libpcre2 to BDEPEND
The dependency is basically free since dev-qt/qtcore:5 or dev-qt/qtbase:6
already depend on dev-libs/libpcre2.
Bug: https://bugs.gentoo.org/872068
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass/ecm.eclass')
| -rw-r--r-- | eclass/ecm.eclass | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 4549fb6bf85..96aedf08d3e 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -266,7 +266,10 @@ case ${ECM_TEST} in ;; esac -BDEPEND+=" >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT}" +BDEPEND+=" + >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT} + dev-libs/libpcre2:* +" RDEPEND+=" >=kde-frameworks/kf-env-4" COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}" @@ -344,10 +347,10 @@ _ecm_punt_kfqt_module() { [[ ! -e "CMakeLists.txt" ]] && return # FIXME: dep=WebKit will result in 'Widgets' over 'WebKitWidgets' (no regression) - pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}(\d+|\\$\{\w*\})[^)]*?${dep}.*?\)" \ + pcre2grep -Mni "(?s)find_package\s*\(\s*${prefix}(\d+|\\$\{\w*\})[^)]*?${dep}.*?\)" \ CMakeLists.txt > "${T}/bogus${dep}" - # pcregrep returns non-zero on no matches/error + # pcre2grep returns non-zero on no matches/error [[ $? -ne 0 ]] && return local length=$(wc -l "${T}/bogus${dep}" | cut -d " " -f 1) @@ -405,10 +408,10 @@ ecm_punt_bogus_dep() { -i CMakeLists.txt || die return else - pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}" + pcre2grep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}" fi - # pcregrep returns non-zero on no matches/error + # pcre2grep returns non-zero on no matches/error if [[ $? -ne 0 ]] ; then return fi |