| 1 |
commit: bdee917110456aabe70233a5832446f9fa2de622 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 1 18:56:10 2018 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 3 13:36:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdee9171 |
| 7 |
|
| 8 |
qt5-build.eclass: use a subshell for insinto+newins |
| 9 |
|
| 10 |
eclass/qt5-build.eclass | 5 +++-- |
| 11 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 14 |
index 963dba571cb..28d303e2a11 100644 |
| 15 |
--- a/eclass/qt5-build.eclass |
| 16 |
+++ b/eclass/qt5-build.eclass |
| 17 |
@@ -804,10 +804,11 @@ qt5_install_module_qconfigs() { |
| 18 |
doins "${T}"/${PN}-qconfig.pri |
| 19 |
) |
| 20 |
|
| 21 |
- if [[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then |
| 22 |
+ # install also the original qconfig.pri |
| 23 |
+ [[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && ( |
| 24 |
insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo |
| 25 |
newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri |
| 26 |
- fi |
| 27 |
+ ) |
| 28 |
} |
| 29 |
|
| 30 |
# @FUNCTION: qt5_regenerate_global_qconfigs |
Archives