diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2016-01-23 03:02:29 +0100 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2016-02-02 19:35:13 +0100 |
| commit | f122552ab4fc6969c50c0d30dcff045919626dac (patch) | |
| tree | 34ac6c2defc444cc0e304639cc6c93efdcfeda46 /eclass/qt5-build.eclass | |
| parent | qt5-build.eclass: update gcc version check for 5.7 and qtwebengine (diff) | |
| download | gentoo-f122552ab4fc6969c50c0d30dcff045919626dac.tar.gz gentoo-f122552ab4fc6969c50c0d30dcff045919626dac.tar.bz2 gentoo-f122552ab4fc6969c50c0d30dcff045919626dac.zip | |
qt5-build.eclass: make gcc version check fatal starting with Qt 5.6
(cherry picked from proj/qt commit 91839540e97eb22f0ac218aa174b06a01870f3f5)
Diffstat (limited to 'eclass/qt5-build.eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 1830d21a09c1..ac9dfc8ebb59 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -127,15 +127,21 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr # @DESCRIPTION: # Unpacks the sources. qt5-build_src_unpack() { + local gcc_version_check_fatal=false local min_gcc4_minor_version=5 + if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then + gcc_version_check_fatal=true + fi if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then min_gcc4_minor_version=7 fi if [[ $(gcc-major-version) -lt 4 ]] || \ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then - ewarn - ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported." - ewarn + if ${gcc_version_check_fatal}; then + die "GCC version 4.${min_gcc4_minor_version} or later is required to build this package" + else + ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported" + fi fi if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then |