diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2007-05-14 11:52:42 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2007-05-14 11:52:42 +0000 |
| commit | b89858cce9ea0294bfb15bb64d0e2ca1715e346a (patch) | |
| tree | f62fc6c62f9d3a378f817e7c7f8921dc9380d837 /x11-libs/qt | |
| parent | Add ~ia64 wrt bug 178480 (diff) | |
| download | gentoo-2-b89858cce9ea0294bfb15bb64d0e2ca1715e346a.tar.gz gentoo-2-b89858cce9ea0294bfb15bb64d0e2ca1715e346a.tar.bz2 gentoo-2-b89858cce9ea0294bfb15bb64d0e2ca1715e346a.zip | |
Some sed foo to change CFLAG stuff, from bug #172219
(Portage version: 2.1.2.4)
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.3.0_rc1.ebuild | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 5543ac5dbf5e..c8c93fb602c0 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.441 2007/05/13 00:14:25 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.442 2007/05/14 11:52:42 caleb Exp $ + + 14 May 2007; Caleb Tennis <caleb@gentoo.org> qt-4.3.0_rc1.ebuild: + Some sed foo to change CFLAG stuff, from bug #172219 13 May 2007; Marcus D. Hanwell <cryos@gentoo.org> qt-4.3.0_rc1.ebuild: Marked ~amd64. diff --git a/x11-libs/qt/qt-4.3.0_rc1.ebuild b/x11-libs/qt/qt-4.3.0_rc1.ebuild index 4c9edc384728..d441e3867c96 100644 --- a/x11-libs/qt/qt-4.3.0_rc1.ebuild +++ b/x11-libs/qt/qt-4.3.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.0_rc1.ebuild,v 1.2 2007/05/13 00:14:25 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.0_rc1.ebuild,v 1.3 2007/05/14 11:52:42 caleb Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -137,8 +137,8 @@ src_unpack() { # 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}:" \ + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ g++.conf @@ -148,6 +148,11 @@ src_unpack() { # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib sed -i -e "s:X11R6/::" linux.conf + cd ${S}/qmake + + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \ + -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix + cd ${S} } |