summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-04-04 12:56:22 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-04-04 12:56:22 +0000
commitcbc3cc7cd16e57e2bfaf3fbabdb32d927a1644fa (patch)
treee6fb16de38660c12c97d4c1461562f75bf83eba5
parentamd64 stable wrt bug #214797 and remove old version. (diff)
downloadgentoo-2-cbc3cc7cd16e57e2bfaf3fbabdb32d927a1644fa.tar.gz
gentoo-2-cbc3cc7cd16e57e2bfaf3fbabdb32d927a1644fa.tar.bz2
gentoo-2-cbc3cc7cd16e57e2bfaf3fbabdb32d927a1644fa.zip
Add patch for gcc-4.3. Fixes bug #207631. Thanks to impulze@impulze.org for the patch.
(Portage version: 2.1.4.4)
-rw-r--r--dev-java/antlr/ChangeLog7
-rw-r--r--dev-java/antlr/antlr-2.7.7.ebuild6
-rw-r--r--dev-java/antlr/files/2.7.7-gcc-4.3.patch11
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index c28885fb38f5..78c6fbd38631 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/antlr
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.62 2008/03/08 13:31:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.63 2008/04/04 12:56:22 betelgeuse Exp $
+
+ 04 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
+ +files/2.7.7-gcc-4.3.patch, antlr-2.7.7.ebuild:
+ Add patch for gcc-4.3. Fixes bug #207631. Thanks to impulze@impulze.org for
+ the patch.
08 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> antlr-2.7.7.ebuild:
Rename nocxx and nojava to cxx and java and turn them on by default using
diff --git a/dev-java/antlr/antlr-2.7.7.ebuild b/dev-java/antlr/antlr-2.7.7.ebuild
index 873e3b67991e..e690e77e8fb9 100644
--- a/dev-java/antlr/antlr-2.7.7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.10 2008/03/08 13:31:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.11 2008/04/04 12:56:22 betelgeuse Exp $
EAPI=1
-inherit java-pkg-2 mono distutils multilib
+inherit base java-pkg-2 mono distutils multilib
DESCRIPTION="A parser generator for C++, C#, Java, and Python"
HOMEPAGE="http://www.antlr.org/"
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
script? ( !dev-util/pccts )
source? ( app-arch/zip )"
+PATCHES=( "${FILESDIR}/2.7.7-gcc-4.3.patch" )
+
src_compile() {
# don't ask why, but this is needed for stuff to get built properly
# across the various JDKs
diff --git a/dev-java/antlr/files/2.7.7-gcc-4.3.patch b/dev-java/antlr/files/2.7.7-gcc-4.3.patch
new file mode 100644
index 000000000000..628f8dd2645a
--- /dev/null
+++ b/dev-java/antlr/files/2.7.7-gcc-4.3.patch
@@ -0,0 +1,11 @@
+diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
+--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp 2006-11-01 22:37:17.000000000 +0100
++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp 2008-03-19 20:09:21.000000000 +0100
+@@ -10,6 +10,7 @@
+
+ #include <antlr/config.hpp>
+
++#include <cstring>
+ #include <map>
+
+ #ifdef HAS_NOT_CCTYPE_H