1 |
commit: bd9b392f33aaf1810c7d59830f495d0ae2ae728d |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 25 12:09:55 2018 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 25 12:10:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bd9b392f |
7 |
|
8 |
qt5-build.eclass: restrict qconfig.pri regeneration changes to 5.9.4 and later |
9 |
|
10 |
eclass/qt5-build.eclass | 10 +++++++--- |
11 |
1 file changed, 7 insertions(+), 3 deletions(-) |
12 |
|
13 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
14 |
index 54e4b321..bc477889 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 ]]; then |
22 |
+ if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 && ${QT5_PATCH_VERSION} -ge 4 ]]; then |
23 |
insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo |
24 |
newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri |
25 |
fi |
26 |
@@ -830,9 +830,13 @@ qt5_regenerate_global_qconfigs() { |
27 |
|
28 |
local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri |
29 |
local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri |
30 |
- if [[ -f ${qconfig_pri} && -f ${qconfig_pri_orig} ]]; then |
31 |
+ if [[ -f ${qconfig_pri} ]]; then |
32 |
local x qconfig_add= qconfig_remove= |
33 |
- local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") |
34 |
+ if [[ -f ${qconfig_pri_orig} ]]; then |
35 |
+ local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") |
36 |
+ else |
37 |
+ local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}") |
38 |
+ fi |
39 |
local new_qt_config= |
40 |
|
41 |
# generate list of QT_CONFIG entries from the existing list, |