diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-01-01 19:01:11 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-01-01 19:01:11 +0000 |
| commit | 9c1fb400cca57346096b5c9c02a521b1a0368cd0 (patch) | |
| tree | bbc57d364558054032a3024dd2bbfb4105f4d837 /eclass | |
| parent | Drop ia64 support #345433 (diff) | |
| download | historical-9c1fb400cca57346096b5c9c02a521b1a0368cd0.tar.gz historical-9c1fb400cca57346096b5c9c02a521b1a0368cd0.tar.bz2 historical-9c1fb400cca57346096b5c9c02a521b1a0368cd0.zip | |
Pass -importdir to configure only for qt >= 4.7 (bug #396685).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 566dd1df23f0..3e3586244496 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.66 2012/01/01 05:02:27 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.67 2012/01/01 19:01:11 pesa Exp $ + + 01 Jan 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Pass -importdir to configure only for qt >= 4.7 (bug #396685). 01 Jan 2012; Mike Gilbert <floppym@gentoo.org> distutils.eclass, python.eclass: diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 92a77809e9f2..c3dd7f4b8632 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.114 2012/01/01 18:12:03 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.115 2012/01/01 19:01:11 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -462,8 +462,9 @@ setqtenv() { standard_configure_options() { local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} - -importdir ${QTIMPORTDIR} -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} - -sysconfdir ${QTSYSCONFDIR} -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} + $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR}) + -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} -sysconfdir ${QTSYSCONFDIR} + -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} -opensource -confirm-license -shared -fast -largefile -stl -verbose -platform $(qt_mkspecs_dir) -nomake examples -nomake demos" |