diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2008-05-09 01:41:10 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2008-05-09 01:41:10 +0000 |
| commit | f44e03f01766adfd07c0c4dd2bd8f54e9b8e6e56 (patch) | |
| tree | f27641ee5c9345b493942f4291eef72d7e11fa46 /app-admin/fam | |
| parent | Works on x86 for me, marking ~x86 (diff) | |
| download | gentoo-2-f44e03f01766adfd07c0c4dd2bd8f54e9b8e6e56.tar.gz gentoo-2-f44e03f01766adfd07c0c4dd2bd8f54e9b8e6e56.tar.bz2 gentoo-2-f44e03f01766adfd07c0c4dd2bd8f54e9b8e6e56.zip | |
Patch to fix building with gcc-4.3 by Martin Väth <vaeth AT mathematik.uni-wuerzburg DOT de>; bug #215475
(Portage version: 2.1.5_rc7)
Diffstat (limited to 'app-admin/fam')
| -rw-r--r-- | app-admin/fam/ChangeLog | 9 | ||||
| -rw-r--r-- | app-admin/fam/fam-2.7.0-r4.ebuild | 6 | ||||
| -rw-r--r-- | app-admin/fam/files/fam-2.7.0-gcc43.patch | 32 |
3 files changed, 43 insertions, 4 deletions
diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog index 0d9edd2a0106..90cf21796fd3 100644 --- a/app-admin/fam/ChangeLog +++ b/app-admin/fam/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/fam -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.49 2007/12/25 13:12:46 phreak Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.50 2008/05/09 01:41:10 halcy0n Exp $ + + 09 May 2008; Mark Loeser <halcy0n@gentoo.org> + +files/fam-2.7.0-gcc43.patch, fam-2.7.0-r4.ebuild: + Patch to fix building with gcc-4.3 by Martin Väth <vaeth AT + mathematik.uni-wuerzburg DOT de>; bug #215475 25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml: Removing foser from metadata.xml as per #120234. Assigning to diff --git a/app-admin/fam/fam-2.7.0-r4.ebuild b/app-admin/fam/fam-2.7.0-r4.ebuild index 1a1ee6ef354a..3259d56a5a50 100644 --- a/app-admin/fam/fam-2.7.0-r4.ebuild +++ b/app-admin/fam/fam-2.7.0-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.17 2007/04/28 16:47:03 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.18 2008/05/09 01:41:10 halcy0n Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -38,6 +38,8 @@ src_unpack() { # Fix gcc 4.1 problems epatch "${FILESDIR}/${P}-gcc41.patch" + epatch "${FILESDIR}/${P}-gcc43.patch" + eautoreconf } diff --git a/app-admin/fam/files/fam-2.7.0-gcc43.patch b/app-admin/fam/files/fam-2.7.0-gcc43.patch new file mode 100644 index 000000000000..7cb3cdab4f43 --- /dev/null +++ b/app-admin/fam/files/fam-2.7.0-gcc43.patch @@ -0,0 +1,32 @@ +--- lib/Client.c++ ++++ lib/Client.c++ +@@ -34,7 +34,7 @@ + #include <syslog.h> + #include <errno.h> + +-#include <iostream.h> ++#include <iostream> + + #include "fam.h" + #include "Client.h" +--- src/DNotify.c++ ++++ src/DNotify.c++ +@@ -31,6 +31,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <libgen.h> ++#include <cstdlib> + + #include "DNotify.h" + +--- src/IMon.c++ ++++ src/IMon.c++ +@@ -40,7 +40,7 @@ + #include "Interest.h" + #include "Log.h" + #include "Scheduler.h" +-#include "alloc.h" ++#include <memory> + + int IMon::imonfd = -2; + IMon::EventHandler IMon::ehandler = NULL; |