diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2006-12-19 14:28:11 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2006-12-19 14:28:11 +0000 |
| commit | f793b0c552474f8ebc9a2aa78e8df4cbd1596ecd (patch) | |
| tree | 1d0a58f1b1427684bd4921cf89352c14fdb8ae9d /x11-libs/qt | |
| parent | Cleaning up mask (diff) | |
| download | gentoo-2-f793b0c552474f8ebc9a2aa78e8df4cbd1596ecd.tar.gz gentoo-2-f793b0c552474f8ebc9a2aa78e8df4cbd1596ecd.tar.bz2 gentoo-2-f793b0c552474f8ebc9a2aa78e8df4cbd1596ecd.zip | |
Make sure we sed the proper stuff
(Portage version: 2.1.2_rc2-r5)
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.2.2.ebuild | 22 |
2 files changed, 22 insertions, 5 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 686e6b035bf5..35f4dcbc3fe0 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.402 2006/12/19 14:07:31 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.403 2006/12/19 14:28:11 caleb Exp $ + + 19 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.2.ebuild: + Make sure we catch sed the proper stuff 19 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.2.ebuild: Make symbol export and examples handling part of configure options instead diff --git a/x11-libs/qt/qt-4.2.2.ebuild b/x11-libs/qt/qt-4.2.2.ebuild index a5ac4fcdadbf..2628b6739050 100644 --- a/x11-libs/qt/qt-4.2.2.ebuild +++ b/x11-libs/qt/qt-4.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.7 2006/12/19 14:07:31 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.8 2006/12/19 14:28:11 caleb Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -110,7 +110,7 @@ src_unpack() { epatch ${FILESDIR}/qt-4.1.4-sparc.patch epatch ${FILESDIR}/qt4-sqlite-configure.patch - cd mkspecs/$(qt_mkspecs_dir) + cd ${S}/mkspecs/$(qt_mkspecs_dir) # set c/xxflags and ldflags # Don't let the user go too overboard with flags. If you really want to, uncomment @@ -124,12 +124,26 @@ src_unpack() { qmake.conf # Do not link with -rpath. See bug #75181. - sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" \ - qmake.conf + sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib sed -i -e "s:X11R6/::" qmake.conf + # The trolls moved the definitions of the above stuff for g++, so we need to edit those files + # separately as well. + cd ${S}/mkspecs/common + + 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}:" \ + g++.conf + + # Do not link with -rpath. See bug #75181. + sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf + + # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib + sed -i -e "s:X11R6/::" linux.conf + cd ${S} } |