1 |
commit: 503556a88131bc82fb921f26dbd5b2ac6fd10598 |
2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 6 19:25:10 2011 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 6 19:25:10 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=503556a8 |
7 |
|
8 |
[eclass] Only check for gcc version if we actually compile something |
9 |
|
10 |
--- |
11 |
eclass/kde4-base.eclass | 8 +++++--- |
12 |
1 files changed, 5 insertions(+), 3 deletions(-) |
13 |
|
14 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
15 |
index 464e10b..c3c5e40 100644 |
16 |
--- a/eclass/kde4-base.eclass |
17 |
+++ b/eclass/kde4-base.eclass |
18 |
@@ -643,9 +643,11 @@ kde4-base_pkg_setup() { |
19 |
# In theory should be in pkg_pretend but we check it only for kdelibs there |
20 |
# and for others we do just quick scan in pkg_setup because pkg_pretend |
21 |
# executions consume quite some time. |
22 |
- [[ $(gcc-major-version) -lt 4 ]] || \ |
23 |
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ |
24 |
- && die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)." |
25 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
26 |
+ [[ $(gcc-major-version) -lt 4 ]] || \ |
27 |
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ |
28 |
+ && die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)." |
29 |
+ fi |
30 |
|
31 |
KDEDIR=/usr |
32 |
: ${PREFIX:=/usr} |