diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-08-25 16:21:38 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-08-25 16:21:38 +0000 |
| commit | 31bb6e9bcee4e507b4e386bdb35afbc8deda8b69 (patch) | |
| tree | bcae06585bb4b47fe0ed9a02a8e18dcf2b7c7106 /dev-lang/gdl | |
| parent | http://my.opera.com/desktopteam/blog/b9034 (diff) | |
| download | gentoo-2-31bb6e9bcee4e507b4e386bdb35afbc8deda8b69.tar.gz gentoo-2-31bb6e9bcee4e507b4e386bdb35afbc8deda8b69.tar.bz2 gentoo-2-31bb6e9bcee4e507b4e386bdb35afbc8deda8b69.zip | |
Fix build with GCC-4.5 wrt bug 334415. Thanks to Diego for report.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/gdl')
| -rw-r--r-- | dev-lang/gdl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/gdl/files/gdl-0.9_rc4-gcc4.5.patch | 24 | ||||
| -rw-r--r-- | dev-lang/gdl/gdl-0.9_rc4.ebuild | 11 |
3 files changed, 35 insertions, 6 deletions
diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog index 929fa4c9582a..c110243ca528 100644 --- a/dev-lang/gdl/ChangeLog +++ b/dev-lang/gdl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/gdl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.20 2010/07/04 19:57:26 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.21 2010/08/25 16:21:38 xarthisius Exp $ + + 25 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> gdl-0.9_rc4.ebuild, + +files/gdl-0.9_rc4-gcc4.5.patch: + Fix build with GCC-4.5 wrt bug 334415. Thanks to Diego for report. 04 Jul 2010; Justin Lecher <jlec@gentoo.org> -gdl-0.9_rc2.ebuild, -gdl-0.9_rc3.ebuild, gdl-0.9_rc4.ebuild, -files/gdl-0.9_rc1-gcc4.3.patch, diff --git a/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.5.patch b/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.5.patch new file mode 100644 index 000000000000..845f2dff1bf1 --- /dev/null +++ b/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.5.patch @@ -0,0 +1,24 @@ +Fix build with GCC-4.5 + +http://gnudatalanguage.cvs.sourceforge.net/viewvc/gnudatalanguage/gdl/src/math_utl.hpp?r1=1.4&r2=1.5&view=patch +http://bugs.gentoo.org/show_bug.cgi?id=334415 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564994 + +--- src/math_utl.hpp ++++ src/math_utl.hpp +@@ -22,11 +22,12 @@ + + //#define ABS(xxx) (( xxx > -xxx)?(xxx):(-xxx)) + +-template< typename T> +-inline T abs( T a) { return (a>=T(0))?a:-a;} +- + namespace lib { + ++ // SA: needs to be inside a namespace for GCC 4.5 ++ template< typename T> ++ inline T abs( T a) { return (a>=T(0))?a:-a;} ++ + // int trans513(char *, int, int, int, DType); + // int transpose(char *, SizeT, SizeT [], SizeT, DType); + // int transpose_perm(char *, SizeT, SizeT [], SizeT, DType, long []); diff --git a/dev-lang/gdl/gdl-0.9_rc4.ebuild b/dev-lang/gdl/gdl-0.9_rc4.ebuild index 9db4cb8e9d48..2bb051e86f13 100644 --- a/dev-lang/gdl/gdl-0.9_rc4.ebuild +++ b/dev-lang/gdl/gdl-0.9_rc4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.6 2010/07/04 19:57:26 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.7 2010/08/25 16:21:38 xarthisius Exp $ EAPI="2" @@ -42,10 +42,11 @@ pkg_setup() { src_prepare() { use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx - epatch "${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch - epatch "${FILESDIR}"/${P}-gcc4.3.patch - epatch "${FILESDIR}"/${P}-antlr.patch - epatch "${FILESDIR}"/${P}-wxwidgets.patch + epatch "${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch \ + "${FILESDIR}"/${P}-gcc4.3.patch \ + "${FILESDIR}"/${P}-antlr.patch \ + "${FILESDIR}"/${P}-wxwidgets.patch \ + "${FILESDIR}"/${P}-gcc4.5.patch # we need to blow away the directory with antlr # otherwise the build system picks up bogus |