diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-02-15 20:47:41 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-02-15 20:47:41 +0000 |
| commit | 5deabf41a807cb64f34e5b64e47c65e08b0de02d (patch) | |
| tree | bd12602eab5429d3b3ff86ca99e59c4119383416 /net-fs | |
| parent | EAPI=2 (diff) | |
| download | gentoo-2-5deabf41a807cb64f34e5b64e47c65e08b0de02d.tar.gz gentoo-2-5deabf41a807cb64f34e5b64e47c65e08b0de02d.tar.bz2 gentoo-2-5deabf41a807cb64f34e5b64e47c65e08b0de02d.zip | |
Update gcc4 patch with fixes for gcc-4.3. Bug 241444. Thanks to Gene Seto <geneseto@hotmail.com> for the patch.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/fex/ChangeLog | 9 | ||||
| -rw-r--r-- | net-fs/fex/files/fex-0.8.18-gcc4.patch | 59 |
2 files changed, 66 insertions, 2 deletions
diff --git a/net-fs/fex/ChangeLog b/net-fs/fex/ChangeLog index ae8103f67547..07b83ed2c337 100644 --- a/net-fs/fex/ChangeLog +++ b/net-fs/fex/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-fs/fex -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/fex/ChangeLog,v 1.5 2007/12/29 03:56:06 dirtyepic Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/fex/ChangeLog,v 1.6 2009/02/15 20:47:32 loki_val Exp $ + + 15 Feb 2009; Peter Alfredsen <loki_val@gentoo.org> + files/fex-0.8.18-gcc4.patch: + Update gcc4 patch with fixes for gcc-4.3. Bug 241444. Thanks to Gene Seto + <geneseto@hotmail.com> for the patch. *fex-0.8.18-r1 (29 Dec 2007) diff --git a/net-fs/fex/files/fex-0.8.18-gcc4.patch b/net-fs/fex/files/fex-0.8.18-gcc4.patch index 00147faaea6f..101c78a1a618 100644 --- a/net-fs/fex/files/fex-0.8.18-gcc4.patch +++ b/net-fs/fex/files/fex-0.8.18-gcc4.patch @@ -97,3 +97,62 @@ diff -Naur fex-0.8.18-orig/src/watchpoint.cpp fex-0.8.18/src/watchpoint.cpp } +diff -rupN fex-0.8.18b/src/modlog.cpp fex-0.8.18/src/modlog.cpp +--- fex-0.8.18b/src/modlog.cpp 2009-01-22 17:00:41.000000000 -0400 ++++ fex-0.8.18/src/modlog.cpp 2009-01-22 17:03:44.000000000 -0400 +@@ -27,6 +27,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <dirent.h> ++#include <cstdlib> + extern "C" { + #include <librsync.h> + } +diff -rupN fex-0.8.18b/src/modlog.h fex-0.8.18/src/modlog.h +--- fex-0.8.18b/src/modlog.h 2009-01-22 17:00:41.000000000 -0400 ++++ fex-0.8.18/src/modlog.h 2009-01-22 17:01:44.000000000 -0400 +@@ -22,7 +22,7 @@ + #ifndef MODLOG_H + #define MODLOG_H + +-#include <string> ++#include <cstring> + #include <map> + + +diff -rupN fex-0.8.18b/src/nmstl/status fex-0.8.18/src/nmstl/status +--- fex-0.8.18b/src/nmstl/status 2009-01-22 17:00:41.000000000 -0400 ++++ fex-0.8.18/src/nmstl/status 2009-01-22 17:02:12.000000000 -0400 +@@ -23,7 +23,7 @@ + #ifndef NMSTL_H_STATUS + #define NMSTL_H_STATUS + +-#include <string> ++#include <cstring> + #include <nmstl/internal.h> + + NMSTL_NAMESPACE_BEGIN; +diff -rupN fex-0.8.18b/src/nmstl_src/debug.cc fex-0.8.18/src/nmstl_src/debug.cc +--- fex-0.8.18b/src/nmstl_src/debug.cc 2009-01-22 17:00:41.000000000 -0400 ++++ fex-0.8.18/src/nmstl_src/debug.cc 2009-01-22 17:04:16.000000000 -0400 +@@ -20,7 +20,8 @@ + * + */ + +-#include <iostream> ++#include <cstdlib> ++#include <cstring> + + #include <nmstl/debug> + #include <nmstl/thread> +diff -rupN fex-0.8.18b/src/nmstl_src/internal.cc fex-0.8.18/src/nmstl_src/internal.cc +--- fex-0.8.18b/src/nmstl_src/internal.cc 2009-01-22 17:00:41.000000000 -0400 ++++ fex-0.8.18/src/nmstl_src/internal.cc 2009-01-22 17:04:45.000000000 -0400 +@@ -21,6 +21,7 @@ + */ + + #include <nmstl/internal.h> ++#include <cstdlib> + + #undef NMSTL_DEBUG_FILE_H + #define NMSTL_DEBUG_FILE_H "nmstl/internal" |