diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-07-19 06:55:36 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-07-19 06:55:36 +0000 |
| commit | fe05b917611ef27a97a21fad209ce8537e33b1c3 (patch) | |
| tree | 7e682b20ca026a31ec1686293c6eb38128af2fd8 /net-im | |
| parent | Revision bump. According to #140931 net-wireless/rt2500 (and to the rt2500 ti... (diff) | |
| download | gentoo-2-fe05b917611ef27a97a21fad209ce8537e33b1c3.tar.gz gentoo-2-fe05b917611ef27a97a21fad209ce8537e33b1c3.tar.bz2 gentoo-2-fe05b917611ef27a97a21fad209ce8537e33b1c3.zip | |
update liveCVS ebuild to work with gcc-4.1
(Portage version: 2.1.1_pre3-r1)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/wengophone/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/wengophone/wengophone-2.0_pre20099999.ebuild | 17 |
2 files changed, 10 insertions, 13 deletions
diff --git a/net-im/wengophone/ChangeLog b/net-im/wengophone/ChangeLog index 83ffb449049a..6ef341dc277e 100644 --- a/net-im/wengophone/ChangeLog +++ b/net-im/wengophone/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/wengophone # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/ChangeLog,v 1.7 2006/06/01 17:15:03 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/ChangeLog,v 1.8 2006/07/19 06:55:36 genstef Exp $ + + 19 Jul 2006; Stefan Schweizer <genstef@gentoo.org> + wengophone-2.0_pre20099999.ebuild: + update liveCVS ebuild to work with gcc-4.1 01 Jun 2006; Stefan Schweizer <genstef@gentoo.org> wengophone-1.0_pre20060408.ebuild: diff --git a/net-im/wengophone/wengophone-2.0_pre20099999.ebuild b/net-im/wengophone/wengophone-2.0_pre20099999.ebuild index d2ae03c55eec..94fcc8a1bc3a 100644 --- a/net-im/wengophone/wengophone-2.0_pre20099999.ebuild +++ b/net-im/wengophone/wengophone-2.0_pre20099999.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/net-im/wengophone/wengophone-2.0_pre20099999.ebuild,v 1.2 2006/05/24 18:19:05 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/wengophone-2.0_pre20099999.ebuild,v 1.3 2006/07/19 06:55:36 genstef Exp $ inherit subversion eutils toolchain-funcs @@ -35,21 +35,14 @@ pkg_setup() { fi if test $(gcc-major-version) -ge 4 \ - && test $(gcc-minor-version) -ge 1; then - eerror "This does not yet build with >=gcc-4.1, see bug #133837" - die "Please switch to gcc-4.0 for compiling" + && test $(gcc-minor-version) -ge 1 && ! grep visit_each.hpp /usr/include/boost/bind.hpp >/dev/null 2>&1; then + eerror "You need to add #include <boost/visit_each.hpp> in" + eerror "/usr/include/boost/bind.hpp to build with gcc-4.1" + die "Please fix your includes" fi - #if ! grep visit_each.hpp /usr/include/boost/bind.hpp >/dev/null 2>&1 \ - # eerror "You need to add #include <boost/visit_each.hpp> in" - # eerror "/usr/include/boost/bind.hpp to build with gcc-4.1" - # die "Please fix your includes" } src_compile() { - sed -i -e "s/File:://" libs/util/util/include/util/File.h - # This breaks runtime, and we have no idea how to fix it properly - #sed -i -e "s:c = connect(slot);://\0:" libs/util/util/include/util/Event.h - QTLIBDIR=/usr/lib/qt4 QTDIR=/usr QTINCLUDEDIR=/usr/include/qt4 \ scons qtwengophone \ mode=release || die "scons failed" |