| 1 |
commit: 70409b54aad5815075dad6a1926807baa6b663fa |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 24 21:04:07 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 24 21:19:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=70409b54 |
| 7 |
|
| 8 |
ecm.eclass: Switch to pcre2grep, add dev-libs/libpcre2 to BDEPEND |
| 9 |
|
| 10 |
The dependency is basically free since dev-qt/qtcore:5 or dev-qt/qtbase:6 |
| 11 |
already depend on dev-libs/libpcre2. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/872068 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
eclass/ecm.eclass | 13 ++++++++----- |
| 17 |
1 file changed, 8 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass |
| 20 |
index 4549fb6bf8..96aedf08d3 100644 |
| 21 |
--- a/eclass/ecm.eclass |
| 22 |
+++ b/eclass/ecm.eclass |
| 23 |
@@ -266,7 +266,10 @@ case ${ECM_TEST} in |
| 24 |
;; |
| 25 |
esac |
| 26 |
|
| 27 |
-BDEPEND+=" >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT}" |
| 28 |
+BDEPEND+=" |
| 29 |
+ >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT} |
| 30 |
+ dev-libs/libpcre2:* |
| 31 |
+" |
| 32 |
RDEPEND+=" >=kde-frameworks/kf-env-4" |
| 33 |
COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}" |
| 34 |
|
| 35 |
@@ -344,10 +347,10 @@ _ecm_punt_kfqt_module() { |
| 36 |
[[ ! -e "CMakeLists.txt" ]] && return |
| 37 |
|
| 38 |
# FIXME: dep=WebKit will result in 'Widgets' over 'WebKitWidgets' (no regression) |
| 39 |
- pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}(\d+|\\$\{\w*\})[^)]*?${dep}.*?\)" \ |
| 40 |
+ pcre2grep -Mni "(?s)find_package\s*\(\s*${prefix}(\d+|\\$\{\w*\})[^)]*?${dep}.*?\)" \ |
| 41 |
CMakeLists.txt > "${T}/bogus${dep}" |
| 42 |
|
| 43 |
- # pcregrep returns non-zero on no matches/error |
| 44 |
+ # pcre2grep returns non-zero on no matches/error |
| 45 |
[[ $? -ne 0 ]] && return |
| 46 |
|
| 47 |
local length=$(wc -l "${T}/bogus${dep}" | cut -d " " -f 1) |
| 48 |
@@ -405,10 +408,10 @@ ecm_punt_bogus_dep() { |
| 49 |
-i CMakeLists.txt || die |
| 50 |
return |
| 51 |
else |
| 52 |
- pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}" |
| 53 |
+ pcre2grep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}" |
| 54 |
fi |
| 55 |
|
| 56 |
- # pcregrep returns non-zero on no matches/error |
| 57 |
+ # pcre2grep returns non-zero on no matches/error |
| 58 |
if [[ $? -ne 0 ]] ; then |
| 59 |
return |
| 60 |
fi |
Archives