| 1 |
commit: 7af3e0c8da764351c0760608e11f9ea91aedcba1 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 20 01:52:42 2018 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 20 01:55:41 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af3e0c8 |
| 7 |
|
| 8 |
qt5-build.eclass: ${D}${QT5_ARCHDATADIR#${EPREFIX}}: keep EPREFIX. |
| 9 |
|
| 10 |
${D}${QT5_ARCHDATADIR#${EPREFIX}} mean no EPREFIX at all. |
| 11 |
${D}${QT5_ARCHDATADIR} is cleaner than |
| 12 |
${ED}${QT5_ARCHDATADIR#${EPREFIX}}, so use it. |
| 13 |
|
| 14 |
eclass/qt5-build.eclass | 4 ++-- |
| 15 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 18 |
index 939a048d3d4..1a20b3dace6 100644 |
| 19 |
--- a/eclass/qt5-build.eclass |
| 20 |
+++ b/eclass/qt5-build.eclass |
| 21 |
@@ -844,8 +844,8 @@ qt5_install_module_config() { |
| 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 |
- newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qmodule.pri qmodule-qtcore.pri |
| 27 |
+ newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qconfig.pri qconfig-qtcore.pri |
| 28 |
+ newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qmodule.pri qmodule-qtcore.pri |
| 29 |
) |
| 30 |
} |
Archives