summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-07 16:28:43 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-07 16:28:43 +0000
commita8069e20611040712a5a76ca5426c94ce0bf0b54 (patch)
treeb6f21ea1e632e62c15f3214fba4eae81381754bd /dev-libs/cxxtools
parentAdd keditfiletype in RDEPEND, bug 246228 (diff)
downloadgentoo-2-a8069e20611040712a5a76ca5426c94ce0bf0b54.tar.gz
gentoo-2-a8069e20611040712a5a76ca5426c94ce0bf0b54.tar.bz2
gentoo-2-a8069e20611040712a5a76ca5426c94ce0bf0b54.zip
Fix building with GCC 4.4+ wrt #279890.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/cxxtools')
-rw-r--r--dev-libs/cxxtools/ChangeLog8
-rw-r--r--dev-libs/cxxtools/cxxtools-1.4.8.ebuild20
-rw-r--r--dev-libs/cxxtools/files/cxxtools-1.4.8-gcc44.patch12
3 files changed, 31 insertions, 9 deletions
diff --git a/dev-libs/cxxtools/ChangeLog b/dev-libs/cxxtools/ChangeLog
index 110e10462de3..cbe4994d73fb 100644
--- a/dev-libs/cxxtools/ChangeLog
+++ b/dev-libs/cxxtools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/cxxtools
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cxxtools/ChangeLog,v 1.6 2008/06/23 13:10:33 fmccor Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cxxtools/ChangeLog,v 1.7 2009/08/07 16:28:43 ssuominen Exp $
+
+ 07 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> cxxtools-1.4.8.ebuild,
+ +files/cxxtools-1.4.8-gcc44.patch:
+ Fix building with GCC 4.4+ wrt #279890.
23 Jun 2008; Ferris McCormick <fmccor@gentoo.org> cxxtools-1.4.8.ebuild:
Add ~sparc for testing, required for Bug #228979.
diff --git a/dev-libs/cxxtools/cxxtools-1.4.8.ebuild b/dev-libs/cxxtools/cxxtools-1.4.8.ebuild
index bd2621517b6e..485a1f6edffd 100644
--- a/dev-libs/cxxtools/cxxtools-1.4.8.ebuild
+++ b/dev-libs/cxxtools/cxxtools-1.4.8.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cxxtools/cxxtools-1.4.8.ebuild,v 1.2 2008/06/23 13:10:33 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cxxtools/cxxtools-1.4.8.ebuild,v 1.3 2009/08/07 16:28:43 ssuominen Exp $
+EAPI=2
inherit eutils
DESCRIPTION="Collection of general purpose C++-classes"
@@ -13,14 +14,19 @@ SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
IUSE=""
-DEPEND="virtual/libiconv"
+RDEPEND="virtual/libiconv"
+DEPEND="${RDEPEND}"
-src_compile() {
- econf --disable-dependency-tracking
- emake || die "emake failed."
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
+ emake DESTDIR="${D}" install || die "emake install failed"
dodoc AUTHORS ChangeLog
}
diff --git a/dev-libs/cxxtools/files/cxxtools-1.4.8-gcc44.patch b/dev-libs/cxxtools/files/cxxtools-1.4.8-gcc44.patch
new file mode 100644
index 000000000000..6ab10f353fd9
--- /dev/null
+++ b/dev-libs/cxxtools/files/cxxtools-1.4.8-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur cxxtools-1.4.8.orig/src/hdstream.cpp cxxtools-1.4.8/src/hdstream.cpp
+--- cxxtools-1.4.8.orig/src/hdstream.cpp 2008-05-04 18:55:37.000000000 +0300
++++ cxxtools-1.4.8/src/hdstream.cpp 2009-08-07 19:27:40.000000000 +0300
+@@ -20,6 +20,8 @@
+ */
+
+ #include "cxxtools/hdstream.h"
++
++#include <cstdio>
+ #include <iomanip>
+ #include <cctype>
+