| 1 |
commit: 2048cd28302473534cd56454c562bff31daefa74 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 7 21:33:16 2016 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 7 21:33:16 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2048cd28 |
| 7 |
|
| 8 |
qt5-build.eclass: don't run gcc version checks if compiler is not gcc |
| 9 |
|
| 10 |
Gentoo-Bug: 587582 |
| 11 |
|
| 12 |
eclass/qt5-build.eclass | 28 +++++++++++++++------------- |
| 13 |
1 file changed, 15 insertions(+), 13 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 16 |
index eeea33c..012918f 100644 |
| 17 |
--- a/eclass/qt5-build.eclass |
| 18 |
+++ b/eclass/qt5-build.eclass |
| 19 |
@@ -141,19 +141,21 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr |
| 20 |
# @DESCRIPTION: |
| 21 |
# Unpacks the sources. |
| 22 |
qt5-build_src_unpack() { |
| 23 |
- local min_gcc4_minor_version=5 |
| 24 |
- if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then |
| 25 |
- min_gcc4_minor_version=7 |
| 26 |
- fi |
| 27 |
- if [[ $(gcc-major-version) -lt 4 ]] || \ |
| 28 |
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then |
| 29 |
- if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then |
| 30 |
- eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package" |
| 31 |
- die "GCC 4.${min_gcc4_minor_version} or later required" |
| 32 |
- else |
| 33 |
- ewarn |
| 34 |
- ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported" |
| 35 |
- ewarn |
| 36 |
+ if tc-is-gcc; then |
| 37 |
+ local min_gcc4_minor_version=5 |
| 38 |
+ if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then |
| 39 |
+ min_gcc4_minor_version=7 |
| 40 |
+ fi |
| 41 |
+ if [[ $(gcc-major-version) -lt 4 ]] || \ |
| 42 |
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then |
| 43 |
+ if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then |
| 44 |
+ eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package" |
| 45 |
+ die "GCC 4.${min_gcc4_minor_version} or later required" |
| 46 |
+ else |
| 47 |
+ ewarn |
| 48 |
+ ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported" |
| 49 |
+ ewarn |
| 50 |
+ fi |
| 51 |
fi |
| 52 |
fi |
Archives