diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2008-05-07 08:29:30 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2008-05-07 08:29:30 +0000 |
| commit | 13a665ce96593cdf4dbd3ac5d17c2cbb2584c97a (patch) | |
| tree | 12a780108fc14d363393e83286a32c1342e77b7c | |
| parent | Version bump (diff) | |
| download | gentoo-2-13a665ce96593cdf4dbd3ac5d17c2cbb2584c97a.tar.gz gentoo-2-13a665ce96593cdf4dbd3ac5d17c2cbb2584c97a.tar.bz2 gentoo-2-13a665ce96593cdf4dbd3ac5d17c2cbb2584c97a.zip | |
Fix gcc-4.3 build issues (bug #217755, thanks to Peter Alfredsen and Debian)
(Portage version: 2.1.5_rc6)
| -rw-r--r-- | dev-libs/log4cpp/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-libs/log4cpp/files/1.0-gcc43.patch | 26 | ||||
| -rw-r--r-- | dev-libs/log4cpp/log4cpp-1.0.ebuild | 7 |
3 files changed, 37 insertions, 5 deletions
diff --git a/dev-libs/log4cpp/ChangeLog b/dev-libs/log4cpp/ChangeLog index a9e4920c3192..a373d2de384a 100644 --- a/dev-libs/log4cpp/ChangeLog +++ b/dev-libs/log4cpp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/log4cpp -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/ChangeLog,v 1.14 2007/10/13 08:04:38 dev-zero Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/ChangeLog,v 1.15 2008/05/07 08:29:30 dev-zero Exp $ + + 07 May 2008; Tiziano Müller <dev-zero@gentoo.org> +files/1.0-gcc43.patch, + log4cpp-1.0.ebuild: + Fix gcc-4.3 build issues (bug #217755, thanks to Peter Alfredsen and + Debian) *log4cpp-1.0 (13 Oct 2007) diff --git a/dev-libs/log4cpp/files/1.0-gcc43.patch b/dev-libs/log4cpp/files/1.0-gcc43.patch new file mode 100644 index 000000000000..a60f986e9c0d --- /dev/null +++ b/dev-libs/log4cpp/files/1.0-gcc43.patch @@ -0,0 +1,26 @@ +Index: log4cpp-1.0/src/BasicLayout.cpp +=================================================================== +--- log4cpp-1.0.orig/src/BasicLayout.cpp 2008-03-14 16:06:57.000000000 -0400 ++++ log4cpp-1.0/src/BasicLayout.cpp 2008-03-14 16:07:11.000000000 -0400 +@@ -15,6 +15,8 @@ + #include <sstream> + #endif + ++#include <memory> ++ + namespace log4cpp { + + BasicLayout::BasicLayout() { +Index: log4cpp-1.0/src/PatternLayout.cpp +=================================================================== +--- log4cpp-1.0.orig/src/PatternLayout.cpp 2008-03-14 16:07:33.000000000 -0400 ++++ log4cpp-1.0/src/PatternLayout.cpp 2008-03-14 16:07:49.000000000 -0400 +@@ -370,7 +370,7 @@ + literal = ""; + } + if ((minWidth != 0) || (maxWidth != 0)) { +- component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0); ++ component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0); + minWidth = maxWidth = 0; + } + _components.push_back(component); diff --git a/dev-libs/log4cpp/log4cpp-1.0.ebuild b/dev-libs/log4cpp/log4cpp-1.0.ebuild index 11fb956edeab..62b9b7a8e1d1 100644 --- a/dev-libs/log4cpp/log4cpp-1.0.ebuild +++ b/dev-libs/log4cpp/log4cpp-1.0.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/dev-libs/log4cpp/log4cpp-1.0.ebuild,v 1.1 2007/10/13 08:04:38 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/log4cpp-1.0.ebuild,v 1.2 2008/05/07 08:29:30 dev-zero Exp $ NEED_AUTOCONF="latest" NEED_AUTOMAKE="latest" @@ -23,7 +23,8 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${PV}-doc_install_path.patch" + epatch "${FILESDIR}/${PV}-doc_install_path.patch" \ + "${FILESDIR}/${PV}-gcc43.patch" AT_M4DIR=m4 eautoreconf |