diff options
| author |   Alex Alexander <wired@gentoo.org> | 2009-10-16 15:02:15 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2009-10-16 15:02:15 +0000 |
| commit | 201821df6ca65466ffae8ebd2bd6641db6265860 (patch) | |
| tree | 2eece0f532da4e9a411e1ec1ba22baf2713631db /eclass | |
| parent | Mask Intel Integrated Primitive support, USE="ipp". (diff) | |
| download | historical-201821df6ca65466ffae8ebd2bd6641db6265860.tar.gz historical-201821df6ca65466ffae8ebd2bd6641db6265860.tar.bz2 historical-201821df6ca65466ffae8ebd2bd6641db6265860.zip | |
getting ready for Qt 4.6
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt4-build.eclass | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 0ab7828207e5..4e54c98833d0 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 2007-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.47 2009/10/03 19:29:04 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.48 2009/10/16 15:02:15 wired Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -46,22 +46,28 @@ RDEPEND=" !>x11-libs/qt-xmlpatterns-${PV}-r9999 " case "${PV}" in - 4.?.?_rc*) + 4.?.?_rc* | 4.?.?_beta* ) SRCTYPE="${SRCTYPE:-opensource-src}" - MY_PV="${PV/_rc/-rc}" + MY_PV="${PV/_/-}" ;; *) SRCTYPE="${SRCTYPE:-opensource-src}" MY_PV="${PV}" ;; esac -MY_P=qt-x11-${SRCTYPE}-${MY_PV} + +if version_is_at_least 4.5.99999999 ${PV} ; then + MY_P="qt-everywhere-${SRCTYPE}-${MY_PV}" +else + MY_P="qt-x11-${SRCTYPE}-${MY_PV}" +fi S=${WORKDIR}/${MY_P} HOMEPAGE="http://qt.nokia.com/" -SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.bz2" if version_is_at_least 4.5.3 ${PV} ; then - SRC_URI="${SRC_URI/bz2/gz}" + SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" +else + SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.bz2" fi case "${PV}" in @@ -297,18 +303,31 @@ standard_configure_options() { *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; esac + # 4.6: build qt-core with exceptions or qt-xmlpatterns won't build + local exceptions= + case "${PV}" in + 4.6.*) + if [[ ${PN} != "qt-core" ]] && [[ ${PN} != "qt-xmlpatterns" ]]; then + exceptions="-no-exceptions" + fi + ;; + *) + [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions" + ;; + esac + myconf="${myconf} -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license -no-rpath -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} -silent -fast - $([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions) + ${exceptions} -reduce-relocations -nomake examples -nomake demos" - # Make eclass 4.5.x ready + # Make eclass >= 4.5.x ready case "${MY_PV}" in - 4.5.?) + 4.5.* | 4.6.* ) myconf="${myconf} -opensource" ;; esac |