summaryrefslogtreecommitdiff
path: root/eclass/kde5-functions.eclass
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-06-09 10:25:41 +0200
committerAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-06-09 10:25:41 +0200
commitf67e010af76759039e645353736ce747489f6688 (patch)
tree2f10324c6d598d08e697833bc03e2e7c018e872f /eclass/kde5-functions.eclass
parent7b422e40ebed7e7a65bd71753d32f149301e26ad (diff)
downloadkde-f67e010af76759039e645353736ce747489f6688.tar.gz
kde-f67e010af76759039e645353736ce747489f6688.tar.bz2
kde-f67e010af76759039e645353736ce747489f6688.zip
kde5-functions.eclass: Improve punt_bogus_dep
The variable holding the min version requirement can be named anything. This should catch most cases, most importantly Qt5 modules.
Diffstat (limited to 'eclass/kde5-functions.eclass')
-rw-r--r--eclass/kde5-functions.eclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 435c8384658..b20d406721d 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -279,7 +279,7 @@ punt_bogus_dep() {
sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
if [[ ${length} = 1 ]] ; then
- sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${KF5_VERSION}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die
+ sed -e "/find_package\s*(\s*${prefix}\(\s\+\(REQUIRED\|CONFIG\|COMPONENTS\|\${[A-Z0-9_]*}\)\)\+\s*)/Is/^/# removed by kde5-functions.eclass - /" -i CMakeLists.txt || die
fi
}