summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-25 20:23:41 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-25 20:23:41 +0000
commit43970d18c576bfba0a8c43bb6db6a1db75288fc3 (patch)
treed68d73a7058df20e2226403ed3991b0864a2e017 /dev-libs/log4cxx
parentInitial commit. Thanks to Almad (bugs@almad.net). Closes bug #238902 (diff)
downloadgentoo-2-43970d18c576bfba0a8c43bb6db6a1db75288fc3.tar.gz
gentoo-2-43970d18c576bfba0a8c43bb6db6a1db75288fc3.tar.bz2
gentoo-2-43970d18c576bfba0a8c43bb6db6a1db75288fc3.zip
Fix building with GCC 4.4 wrt #273843, thanks to Łukasz Michalik.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/log4cxx')
-rw-r--r--dev-libs/log4cxx/ChangeLog6
-rw-r--r--dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch12
-rw-r--r--dev-libs/log4cxx/log4cxx-0.10.0.ebuild6
3 files changed, 20 insertions, 4 deletions
diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog
index 822e6b5bd504..1391c671dc41 100644
--- a/dev-libs/log4cxx/ChangeLog
+++ b/dev-libs/log4cxx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/log4cxx
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.28 2009/04/11 15:40:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.29 2009/07/25 20:23:41 ssuominen Exp $
+
+ 25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> log4cxx-0.10.0.ebuild,
+ +files/log4cxx-0.10.0-gcc44.patch:
+ Fix building with GCC 4.4 wrt #273843, thanks to Łukasz Michalik.
11 Apr 2009; Raúl Porcel <armin76@gentoo.org> log4cxx-0.10.0.ebuild:
Add ~alpha/~ia64
diff --git a/dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch b/dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch
new file mode 100644
index 000000000000..854d34a17492
--- /dev/null
+++ b/dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch
@@ -0,0 +1,12 @@
+Fix for gcc-4.4
+--- apache-log4cxx-0.10.0-orig/src/examples/cpp/console.cpp 2009-06-12 13:01:06.000000000 +0200
++++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp 2009-06-12 13:07:05.000000000 +0200
+@@ -15,6 +15,7 @@
+ * limitations under the License.
+ */
+
++#include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+ #include <log4cxx/logger.h>
+
diff --git a/dev-libs/log4cxx/log4cxx-0.10.0.ebuild b/dev-libs/log4cxx/log4cxx-0.10.0.ebuild
index 9e8598cddf2b..85a5c5adfb73 100644
--- a/dev-libs/log4cxx/log4cxx-0.10.0.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.10.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild,v 1.4 2009/04/11 15:40:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild,v 1.5 2009/07/25 20:23:41 ssuominen Exp $
EAPI="1"
@@ -36,8 +36,8 @@ pkg_setup() {
src_unpack() {
unpack ${A}
cd "${S}"
-
- epatch "${FILESDIR}/${PV}-missing_includes.patch"
+ epatch "${FILESDIR}"/${PV}-missing_includes.patch \
+ "${FILESDIR}"/${P}-gcc44.patch
}
src_compile() {