diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-12-29 17:46:55 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-12-29 17:46:55 +0000 |
| commit | d60a2c555bea9372c202dad397139d9c0b882e81 (patch) | |
| tree | ada84987470969770a6498c53664752a96f7d914 /x11-libs/qt | |
| parent | Updated evolution and dependencies for 2.8.2 (Manifest recommit) (diff) | |
| download | gentoo-2-d60a2c555bea9372c202dad397139d9c0b882e81.tar.gz gentoo-2-d60a2c555bea9372c202dad397139d9c0b882e81.tar.bz2 gentoo-2-d60a2c555bea9372c202dad397139d9c0b882e81.zip | |
This fixes the build problem of qt tools attempting to link outside of the build directory to an existing version of Qt
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/files/qt4-qtprf.patch | 11 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.0.0_beta1-r1.ebuild | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/x11-libs/qt/files/qt4-qtprf.patch b/x11-libs/qt/files/qt4-qtprf.patch new file mode 100644 index 000000000000..66d0388629cb --- /dev/null +++ b/x11-libs/qt/files/qt4-qtprf.patch @@ -0,0 +1,11 @@ +--- mkspecs/features/unix/qt.prf.orig 2004-12-29 11:19:43.660482480 -0500 ++++ mkspecs/features/unix/qt.prf 2004-12-29 11:19:39.329140944 -0500 +@@ -7,7 +7,7 @@ + # prevents us from picking up "stale" includes + INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH + +-!isEmpty(QMAKE_RTLDIR_QT):QMAKE_LIBDIR += $$QMAKE_RTLDIR_QT ++#!isEmpty(QMAKE_RTLDIR_QT):QMAKE_LIBDIR += $$QMAKE_RTLDIR_QT + QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT + for(QTLIB, $$list($$lower($$unique(QT)))) { + qlib = diff --git a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild index b3681fe1199e..ed18f8c31bbb 100644 --- a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild +++ b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild,v 1.4 2004/12/28 21:12:56 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild,v 1.5 2004/12/29 17:46:55 caleb Exp $ inherit eutils flag-o-matic @@ -67,6 +67,7 @@ src_unpack() { # Qt4 moc does not work with -O3, unfortunately. replace-flags -O3 -O2 filter-flags -finline-functions + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ @@ -75,6 +76,7 @@ src_unpack() { epatch ${FILESDIR}/qt4b1.patch epatch ${FILESDIR}/qt4b1_20041228.patch epatch ${FILESDIR}/qt4-rpath.patch + epatch ${FILESDIR}/qt4-qtprf.patch } src_compile() { @@ -134,6 +136,7 @@ src_install() { dodir /usr/lib/qt4/mkspecs cp -a ${S}/mkspecs/linux-g++ ${D}/usr/lib/qt4/mkspecs/linux-g++ + cp -a ${S}/mkspecs/features ${D}/usr/lib/qt4/mkspecs/features cp -a ${S}/mkspecs/default ${D}/usr/lib/qt4/mkspecs/default insinto /etc/env.d |