1 |
commit: f4248411525df0fd32662af8a9f07e9bcc5a0f09 |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 1 18:32:15 2018 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 1 18:51:47 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f4248411 |
7 |
|
8 |
qt5-build.eclass: fix warning message |
9 |
|
10 |
eclass/qt5-build.eclass | 10 +++++----- |
11 |
1 file changed, 5 insertions(+), 5 deletions(-) |
12 |
|
13 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
14 |
index 25d4136c..963dba57 100644 |
15 |
--- a/eclass/qt5-build.eclass |
16 |
+++ b/eclass/qt5-build.eclass |
17 |
@@ -804,7 +804,7 @@ qt5_install_module_qconfigs() { |
18 |
doins "${T}"/${PN}-qconfig.pri |
19 |
) |
20 |
|
21 |
- if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then |
22 |
+ if [[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then |
23 |
insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo |
24 |
newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri |
25 |
fi |
26 |
@@ -832,12 +832,12 @@ qt5_regenerate_global_qconfigs() { |
27 |
local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri |
28 |
if [[ -f ${qconfig_pri} ]]; then |
29 |
local x qconfig_add= qconfig_remove= |
30 |
+ local qt_config new_qt_config= |
31 |
if [[ -f ${qconfig_pri_orig} ]]; then |
32 |
- local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") |
33 |
+ qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") |
34 |
else |
35 |
- local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}") |
36 |
+ qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}") |
37 |
fi |
38 |
- local new_qt_config= |
39 |
|
40 |
# generate list of QT_CONFIG entries from the existing list, |
41 |
# appending QCONFIG_ADD and excluding QCONFIG_REMOVE |
42 |
@@ -857,6 +857,6 @@ qt5_regenerate_global_qconfigs() { |
43 |
sed -i -e "s/^QT_CONFIG\s*+=.*/QT_CONFIG +=${new_qt_config}/" \ |
44 |
"${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in ${qconfig_pri}" |
45 |
else |
46 |
- ewarn "${qconfig_pri} or ${qconfig_pri_orig} does not exist or is not a regular file" |
47 |
+ ewarn "${qconfig_pri} does not exist or is not a regular file" |
48 |
fi |
49 |
} |