| 1 |
spatz 10/05/30 10:31:05 |
| 2 |
|
| 3 |
Modified: qt4-build.eclass |
| 4 |
Log: |
| 5 |
Fix sedding of $MAKE in qt 4.5, bug 321335 (again). |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.74 eclass/qt4-build.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.74&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.74&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.73&r2=1.74 |
| 13 |
|
| 14 |
Index: qt4-build.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
| 17 |
retrieving revision 1.73 |
| 18 |
retrieving revision 1.74 |
| 19 |
diff -u -r1.73 -r1.74 |
| 20 |
--- qt4-build.eclass 27 May 2010 21:27:31 -0000 1.73 |
| 21 |
+++ qt4-build.eclass 30 May 2010 10:31:05 -0000 1.74 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2009 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.73 2010/05/27 21:27:31 spatz Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.74 2010/05/30 10:31:05 spatz Exp $ |
| 27 |
|
| 28 |
# @ECLASS: qt4-build.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -215,10 +215,12 @@ |
| 31 |
sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ |
| 32 |
-i configure || die "sed qmake compilers failed" |
| 33 |
# bug 321335 |
| 34 |
- find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ |
| 35 |
- xargs -0 \ |
| 36 |
- sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):g" \ |
| 37 |
- -i || die "sed test compilers failed" |
| 38 |
+ if version_is_at_least 4.6; then |
| 39 |
+ find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ |
| 40 |
+ xargs -0 \ |
| 41 |
+ sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):g" \ |
| 42 |
+ -i || die "sed test compilers failed" |
| 43 |
+ fi |
| 44 |
|
| 45 |
# Bug 172219 |
| 46 |
sed -e "s:X11R6/::" \ |
Archives