| 1 |
commit: b1ffe55112b9d2cf0a5da0ca9835d920618e597c |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 7 21:35:23 2016 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 7 21:35:23 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ffe551 |
| 7 |
|
| 8 |
qt4-build-multilib.eclass: don't run gcc version checks if compiler is not gcc |
| 9 |
|
| 10 |
eclass/qt4-build-multilib.eclass | 13 ++++++++----- |
| 11 |
1 file changed, 8 insertions(+), 5 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
| 14 |
index 8e20a77..2a84bc5 100644 |
| 15 |
--- a/eclass/qt4-build-multilib.eclass |
| 16 |
+++ b/eclass/qt4-build-multilib.eclass |
| 17 |
@@ -113,10 +113,13 @@ multilib_src_install_all() { qt4_multilib_src_install_all; } |
| 18 |
# @DESCRIPTION: |
| 19 |
# Unpacks the sources. |
| 20 |
qt4-build-multilib_src_unpack() { |
| 21 |
- if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then |
| 22 |
- ewarn |
| 23 |
- ewarn "Using a GCC version lower than 4.4 is not supported." |
| 24 |
- ewarn |
| 25 |
+ if tc-is-gcc; then |
| 26 |
+ if [[ $(gcc-major-version) -lt 4 ]] || \ |
| 27 |
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then |
| 28 |
+ ewarn |
| 29 |
+ ewarn "Using a GCC version lower than 4.4 is not supported" |
| 30 |
+ ewarn |
| 31 |
+ fi |
| 32 |
fi |
| 33 |
|
| 34 |
if [[ ${PN} == qtwebkit ]]; then |
| 35 |
@@ -172,7 +175,7 @@ qt4-build-multilib_src_prepare() { |
| 36 |
if [[ ${PN} == qtdeclarative ]]; then |
| 37 |
# Bug 551560 |
| 38 |
# gcc-4.8 ICE with -Os, fixed in 4.9 |
| 39 |
- if use x86 && [[ $(gcc-version) == 4.8 ]]; then |
| 40 |
+ if use x86 && tc-is-gcc && [[ $(gcc-version) == 4.8 ]]; then |
| 41 |
replace-flags -Os -O2 |
| 42 |
fi |
| 43 |
fi |
Archives