diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2018-01-25 23:09:55 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2018-01-25 23:10:20 +1100 |
| commit | bd9b392f33aaf1810c7d59830f495d0ae2ae728d (patch) | |
| tree | 73a93d2d02137c718038816d7e699d95a21949a9 /eclass | |
| parent | qt5-build.eclass: fix qconfig.pri regeneration. (diff) | |
| download | qt-bd9b392f33aaf1810c7d59830f495d0ae2ae728d.tar.gz qt-bd9b392f33aaf1810c7d59830f495d0ae2ae728d.tar.bz2 qt-bd9b392f33aaf1810c7d59830f495d0ae2ae728d.zip | |
qt5-build.eclass: restrict qconfig.pri regeneration changes to 5.9.4 and later
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 54e4b321..bc477889 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -804,7 +804,7 @@ qt5_install_module_qconfigs() { doins "${T}"/${PN}-qconfig.pri ) - if [[ ${PN} = qtcore ]]; then + if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 && ${QT5_PATCH_VERSION} -ge 4 ]]; then insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri fi @@ -830,9 +830,13 @@ qt5_regenerate_global_qconfigs() { local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri - if [[ -f ${qconfig_pri} && -f ${qconfig_pri_orig} ]]; then + if [[ -f ${qconfig_pri} ]]; then local x qconfig_add= qconfig_remove= - local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") + if [[ -f ${qconfig_pri_orig} ]]; then + local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") + else + local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}") + fi local new_qt_config= # generate list of QT_CONFIG entries from the existing list, |