| 1 |
pesa 12/01/01 19:01:11 |
| 2 |
|
| 3 |
Modified: ChangeLog qt4-build.eclass |
| 4 |
Log: |
| 5 |
Pass -importdir to configure only for qt >= 4.7 (bug #396685). |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.67 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.67&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.67&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.66&r2=1.67 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.66 |
| 18 |
retrieving revision 1.67 |
| 19 |
diff -u -r1.66 -r1.67 |
| 20 |
--- ChangeLog 1 Jan 2012 05:02:27 -0000 1.66 |
| 21 |
+++ ChangeLog 1 Jan 2012 19:01:11 -0000 1.67 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.66 2012/01/01 05:02:27 floppym Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.67 2012/01/01 19:01:11 pesa Exp $ |
| 27 |
+ |
| 28 |
+ 01 Jan 2012; Davide Pesavento <pesa@g.o> qt4-build.eclass: |
| 29 |
+ Pass -importdir to configure only for qt >= 4.7 (bug #396685). |
| 30 |
|
| 31 |
01 Jan 2012; Mike Gilbert <floppym@g.o> distutils.eclass, |
| 32 |
python.eclass: |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.115 eclass/qt4-build.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.115&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.115&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.114&r2=1.115 |
| 41 |
|
| 42 |
Index: qt4-build.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
| 45 |
retrieving revision 1.114 |
| 46 |
retrieving revision 1.115 |
| 47 |
diff -u -r1.114 -r1.115 |
| 48 |
--- qt4-build.eclass 1 Jan 2012 18:12:03 -0000 1.114 |
| 49 |
+++ qt4-build.eclass 1 Jan 2012 19:01:11 -0000 1.115 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
-# Copyright 1999-2011 Gentoo Foundation |
| 52 |
+# Copyright 1999-2012 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.114 2012/01/01 18:12:03 pesa Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.115 2012/01/01 19:01:11 pesa Exp $ |
| 56 |
|
| 57 |
# @ECLASS: qt4-build.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -462,8 +462,9 @@ |
| 60 |
standard_configure_options() { |
| 61 |
local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} |
| 62 |
-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} |
| 63 |
- -importdir ${QTIMPORTDIR} -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} |
| 64 |
- -sysconfdir ${QTSYSCONFDIR} -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} |
| 65 |
+ $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR}) |
| 66 |
+ -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} -sysconfdir ${QTSYSCONFDIR} |
| 67 |
+ -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} |
| 68 |
-opensource -confirm-license -shared -fast -largefile -stl -verbose |
| 69 |
-platform $(qt_mkspecs_dir) -nomake examples -nomake demos" |
Archives