From: | "Markos Chandras (hwoarang)" <hwoarang@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in eclass: qt4-r2.eclass |
Date: | Sat, 31 Jul 2010 15:02:24 |
Message-Id: | 20100731144015.897092CE15@corvid.gentoo.org |
1 | hwoarang 10/07/31 14:40:15 |
2 | |
3 | Modified: qt4-r2.eclass |
4 | Log: |
5 | Adding -config option to eqmake4. Bug #328457. Thanks to Davide Pesavento for |
6 | the patch |
7 | |
8 | Revision Changes Path |
9 | 1.7 eclass/qt4-r2.eclass |
10 | |
11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.7&view=markup |
12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.7&content-type=text/plain |
13 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?r1=1.6&r2=1.7 |
14 | |
15 | Index: qt4-r2.eclass |
16 | =================================================================== |
17 | RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v |
18 | retrieving revision 1.6 |
19 | retrieving revision 1.7 |
20 | diff -u -r1.6 -r1.7 |
21 | --- qt4-r2.eclass 15 Apr 2010 06:51:08 -0000 1.6 |
22 | +++ qt4-r2.eclass 31 Jul 2010 14:40:14 -0000 1.7 |
23 | @@ -1,6 +1,6 @@ |
24 | # Copyright 1999-2010 Gentoo Foundation |
25 | # Distributed under the terms of the GNU General Public License v2 |
26 | -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.6 2010/04/15 06:51:08 abcd Exp $ |
27 | +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.7 2010/07/31 14:40:14 hwoarang Exp $ |
28 | |
29 | # @ECLASS: qt4-r2.eclass |
30 | # @MAINTAINER: |
31 | @@ -244,7 +244,9 @@ |
32 | |
33 | [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= |
34 | |
35 | - "${EPREFIX}"/usr/bin/qmake -makefile -nocache \ |
36 | + "${EPREFIX}"/usr/bin/qmake \ |
37 | + -makefile -nocache \ |
38 | + -config ${CONFIG_ADD} \ |
39 | QTDIR="${EPREFIX}"/usr/$(get_libdir) \ |
40 | QMAKE="${EPREFIX}"/usr/bin/qmake \ |
41 | QMAKE_CC=$(tc-getCC) \ |