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
commit8aada4e61d659626f23a8ab8847c57117ad88332 (patch)
treeef47b48b19c80357ced9761790a4f9e230e6a8dc /dev-libs/cxxtools
parentAdd keditfiletype in RDEPEND, bug 246228 (diff)
downloadhistorical-8aada4e61d659626f23a8ab8847c57117ad88332.tar.gz
historical-8aada4e61d659626f23a8ab8847c57117ad88332.tar.bz2
historical-8aada4e61d659626f23a8ab8847c57117ad88332.zip
Fix building with GCC 4.4+ wrt #279890.
Package-Manager: portage-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/Manifest5
-rw-r--r--dev-libs/cxxtools/cxxtools-1.4.8.ebuild20
-rw-r--r--dev-libs/cxxtools/files/cxxtools-1.4.8-gcc44.patch12
4 files changed, 34 insertions, 11 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/Manifest b/dev-libs/cxxtools/Manifest
index 6b8fd72a8e5f..19f73f93b424 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -1,4 +1,5 @@
AUX cxxtools-1.4.7-gcc43.patch 461 RMD160 b2592803a702f75c2caea7b09d891668fdef66da SHA1 622d8059ca3f809f71e4cdea58594d70de550585 SHA256 76c89bf1af517a63cfbb9d7faeda514c9704ee5589d8ddbad0cb5f6b45e8030f
+AUX cxxtools-1.4.8-gcc44.patch 346 RMD160 c185fe0dedf0b1bf719f1aa62730fe7d975ab382 SHA1 d56b46eaf537c71e3c251a11bb61defe99729039 SHA256 197bf699d4a717ab3d0f6879258986255e3bc6ac9b9f0aaeaeac2cafb5cde32b
DIST cxxtools-1.4.4.tar.gz 749062 RMD160 971dd52c4eccb4e34b2e2e3dff2288f44ce33f53 SHA1 93a08c9c9813a9c2e3004cf6c6253cb83c2d8802 SHA256 8cba2f7ccd8aa992e04b7ebb5e5ebdc4a9205ad6f9223831c22af36ec0e229c9
DIST cxxtools-1.4.5.tar.gz 739511 RMD160 65605383dac9f4f551d9c061c35e2a6c8fb75340 SHA1 32a8c4a7968c357be2f81727c5b972d1042417f3 SHA256 946424fd98654bda728c1ff0454e8de7f022b8d5dd90b699383c37fd4476d024
DIST cxxtools-1.4.7.tar.gz 444536 RMD160 a7ce138a70c62233ecd629e36f75e212dbac8414 SHA1 80fb654a6e0d0eb6f31ee30cd31f8c5fe228d95d SHA256 46a8ebef1a59b8f380b4392c8a10f31a6168646e763b808f4600dccbfc117800
@@ -6,6 +7,6 @@ DIST cxxtools-1.4.8.tar.gz 451807 RMD160 842f180cbfa15b4a23c4f7cd7223fac090b2fa0
EBUILD cxxtools-1.4.4.ebuild 633 RMD160 0c72e72b47616ab601cc8b4150a07795a0b67ac2 SHA1 fa7b5e7d7db85362ca8a6130071e88ee3516ace7 SHA256 24813c651d90247fd666fd13f329adffce69d96c77f85aec044b90d73ccf5d4e
EBUILD cxxtools-1.4.5.ebuild 644 RMD160 e153c986bb3fc0c917424f8c129e616a05eb3d8c SHA1 18da995bfd615f03173414b9f1a93230a7ec9e4f SHA256 89b71b8ffeff10b255575a9e6b36a68558b1c30cd0ced793ac36760d6afcce6a
EBUILD cxxtools-1.4.7.ebuild 747 RMD160 d362e97b416e5ffec49abcc0765ce7e42b3582e3 SHA1 543f5f113ba51fd38902536ff8d9ba20543e8860 SHA256 2b41644df3a0aafb2cc5e3262d997791725ce022f0c141f33aa34ee92e50cb60
-EBUILD cxxtools-1.4.8.ebuild 675 RMD160 c77bb90f6dd5e9509944b1598243fcd5adbf9232 SHA1 129ead47b285c65f40854328872a2f15395ec69c SHA256 f4713b7f022cac62671613c330158ca83b6a64131c96c8b715811fbe990afc17
-MISC ChangeLog 1077 RMD160 786e318600cc7a5e097083ef516d90742cf76e15 SHA1 f0ea4709e33af633c9cadf8c5a3eab9f6257b54f SHA256 421d933c9b29b78f10b7439d0f9bff3e2a243adda78a75f5c0ba4c4c0a427abf
+EBUILD cxxtools-1.4.8.ebuild 739 RMD160 6363927f4893f4d23c6f278a02e757b0aef177dc SHA1 4ab51789e11463a4f9929acee4d762b3cf6a28cf SHA256 8d1730d168446f9e0ec24705ed0a61c2900518e35ea2bb2321f61cf963a53410
+MISC ChangeLog 1237 RMD160 691ab475a3045769d38f075f2e8388da136ace92 SHA1 700b8d27b73d5c2b7369b53f56eca4190ee1d12b SHA256 dae5645a9396b43e9f952c1609528955382bbb6fc7c5b2d579f283f7064a152e
MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
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>
+