diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-09-24 23:04:07 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-10-11 14:39:45 +0200 |
| commit | 61773ffee736b867a5d03f78012a7f8faf2cb9c1 (patch) | |
| tree | 3a41dad89bee8f99fb0152ff2d63933ee81b1548 | |
| parent | dev-ada/e3-core: do not install *pth files (diff) | |
| download | gentoo-61773ffee736b867a5d03f78012a7f8faf2cb9c1.tar.gz gentoo-61773ffee736b867a5d03f78012a7f8faf2cb9c1.tar.bz2 gentoo-61773ffee736b867a5d03f78012a7f8faf2cb9c1.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.
Closes: https://bugs.gentoo.org/872068
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -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 8febb9d22850..47992dbc86ca 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -247,7 +247,10 @@ case ${ECM_TEST} in ;; esac -BDEPEND+=" >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT}" +BDEPEND+=" + dev-libs/libpcre2:* + >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT} +" RDEPEND+=" >=kde-frameworks/kf-env-4" COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}" @@ -325,10 +328,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) @@ -386,10 +389,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 |