summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2008-04-14 22:11:49 +0000
committerAlfredo Tupone <tupone@gentoo.org>2008-04-14 22:11:49 +0000
commit63227c3eb79171840e4a7d9b24adbb78c3f45da7 (patch)
tree911edf7f3566f077f3ab5d4ed71bdebb83c8093a /media-libs/atlas-c++
parentgnome-base/gnome-panel: Bump to 2.22.1.2 (diff)
downloadgentoo-2-63227c3eb79171840e4a7d9b24adbb78c3f45da7.tar.gz
gentoo-2-63227c3eb79171840e4a7d9b24adbb78c3f45da7.tar.bz2
gentoo-2-63227c3eb79171840e4a7d9b24adbb78c3f45da7.zip
Fix for gcc-4.3.0 Bug #217622
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-libs/atlas-c++')
-rw-r--r--media-libs/atlas-c++/ChangeLog6
-rw-r--r--media-libs/atlas-c++/atlas-c++-0.6.1.ebuild5
-rw-r--r--media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.3.patch30
3 files changed, 38 insertions, 3 deletions
diff --git a/media-libs/atlas-c++/ChangeLog b/media-libs/atlas-c++/ChangeLog
index c8539f21e894..ea0b227247e0 100644
--- a/media-libs/atlas-c++/ChangeLog
+++ b/media-libs/atlas-c++/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/atlas-c++
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/ChangeLog,v 1.23 2008/02/29 07:23:41 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/ChangeLog,v 1.24 2008/04/14 22:11:49 tupone Exp $
+
+ 14 Apr 2008; Tupone Alfredo <tupone@gentoo.org>
+ +files/atlas-c++-0.6.1-gcc-4.3.patch, atlas-c++-0.6.1.ebuild:
+ Fix for gcc-4.3.0 Bug #217622 by Peter Alfredsen
29 Feb 2008; Tupone Alfredo <tupone@gentoo.org>
+files/atlas-c++-0.6.1-strict-aliasing.patch, atlas-c++-0.4.5.ebuild,
diff --git a/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild b/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild
index 3883883d1376..a295a9f3a07a 100644
--- a/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild
+++ b/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild,v 1.3 2008/02/29 07:23:41 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/atlas-c++-0.6.1.ebuild,v 1.4 2008/04/14 22:11:49 tupone Exp $
inherit eutils autotools
@@ -24,7 +24,8 @@ S=${WORKDIR}/${MY_P}
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}"/${P}-strict-aliasing.patch
+ epatch "${FILESDIR}"/${P}-strict-aliasing.patch \
+ "${FILESDIR}"/${P}-gcc-4.3.patch
eautoreconf
}
diff --git a/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.3.patch b/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.3.patch
new file mode 100644
index 000000000000..6ac1bc6e6194
--- /dev/null
+++ b/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.3.patch
@@ -0,0 +1,30 @@
+--- Atlas/Filter.cpp.old 2008-04-14 23:55:23.000000000 +0200
++++ Atlas/Filter.cpp 2008-04-14 23:57:04.000000000 +0200
+@@ -4,6 +4,8 @@
+
+ #include <Atlas/Filter.h>
+
++#include <string.h>
++
+ namespace Atlas {
+
+ Filter::Filter(Filter* next)
+@@ -41,7 +43,7 @@
+
+ if (numPutback > m_inPutback) numPutback = m_inPutback;
+
+- std::memcpy(m_outBuffer + (m_inPutback - numPutback),
++ ::memcpy(m_outBuffer + (m_inPutback - numPutback),
+ gptr() - numPutback,
+ (unsigned long) numPutback);
+
+--- tools/atlas_convert.cpp.old 2008-04-14 23:58:53.000000000 +0200
++++ tools/atlas_convert.cpp 2008-04-14 23:59:15.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include <fstream>
+ #include <iostream>
+
++#include <stdlib.h>
+ #include <unistd.h>
+
+ int option_format = 0;