Gentoo Archives: gentoo-commits

From: "Dominik Kapusta (ayoy)" <ayoy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass
Date: Sat, 03 Oct 2009 19:29:05
Message-Id: E1MuAHw-0002i5-Dj@stork.gentoo.org
1 ayoy 09/10/03 19:29:04
2
3 Modified: qt4-build.eclass
4 Log:
5 Trying to fix bug #282984 in a clean way. Passing system compilers to emake in build_directories()
6
7 Revision Changes Path
8 1.47 eclass/qt4-build.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.47&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.47&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.46&r2=1.47
13
14 Index: qt4-build.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
17 retrieving revision 1.46
18 retrieving revision 1.47
19 diff -u -r1.46 -r1.47
20 --- qt4-build.eclass 2 Oct 2009 16:39:41 -0000 1.46
21 +++ qt4-build.eclass 3 Oct 2009 19:29:04 -0000 1.47
22 @@ -1,6 +1,6 @@
23 # Copyright 2007-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.46 2009/10/02 16:39:41 wired Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.47 2009/10/03 19:29:04 ayoy Exp $
27
28 # @ECLASS: qt4-build.eclass
29 # @MAINTAINER:
30 @@ -326,7 +326,9 @@
31 cd "${S}"/${x}
32 sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/linux.conf || die
33 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
34 - emake || die "emake failed"
35 + emake CC="@echo compiling \$< && $(tc-getCC)" \
36 + CXX="@echo compiling \$< && $(tc-getCXX)" \
37 + LINK="@echo linking \$@ && $(tc-getCXX)" || die "emake failed"
38 done
39 }