summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2016-07-29 14:47:31 +0200
committerMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2016-08-05 18:34:47 +0200
commit7123a0fffc3d71d31a8b7e2fbe1332195a6e2a88 (patch)
treed1bfb66419ca76a811c807d63330c9ed3696aeed /dev-java/antlr/files
parentgames-board/peg-e: remove deprecated games eclass (diff)
downloadgentoo-7123a0fffc3d71d31a8b7e2fbe1332195a6e2a88.tar.gz
gentoo-7123a0fffc3d71d31a8b7e2fbe1332195a6e2a88.tar.bz2
gentoo-7123a0fffc3d71d31a8b7e2fbe1332195a6e2a88.zip
dev-java/antlr: remove unused patches
Diffstat (limited to 'dev-java/antlr/files')
-rw-r--r--dev-java/antlr/files/2.7.7-gcc-4.3.patch11
-rw-r--r--dev-java/antlr/files/2.7.7-gcc-4.4.patch10
-rw-r--r--dev-java/antlr/files/2.7.7-makefixes.patch68
-rw-r--r--dev-java/antlr/files/2.7.7-static-libs-fix.patch22
-rw-r--r--dev-java/antlr/files/antlr-3.1.3-jdk-8.patch28
5 files changed, 0 insertions, 139 deletions
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
deleted file mode 100644
index 628f8dd2645a..000000000000
--- a/dev-java/antlr/files/2.7.7-gcc-4.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/dev-java/antlr/files/2.7.7-gcc-4.4.patch b/dev-java/antlr/files/2.7.7-gcc-4.4.patch
deleted file mode 100644
index e1790ec4e0c6..000000000000
--- a/dev-java/antlr/files/2.7.7-gcc-4.4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/cpp/antlr/CharScanner.hpp~ 2008-11-11 21:24:02.000000000 +0000
-+++ lib/cpp/antlr/CharScanner.hpp 2008-11-11 21:24:33.000000000 +0000
-@@ -10,6 +10,7 @@
-
- #include <antlr/config.hpp>
-
-+#include <cstdio>
- #include <cstring>
- #include <map>
-
diff --git a/dev-java/antlr/files/2.7.7-makefixes.patch b/dev-java/antlr/files/2.7.7-makefixes.patch
deleted file mode 100644
index cb12752189a7..000000000000
--- a/dev-java/antlr/files/2.7.7-makefixes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Nur antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in
---- antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in 2006-11-01 23:37:17.000000000 +0200
-+++ antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in 2009-03-30 02:09:28.000000000 +0300
-@@ -143,7 +143,7 @@
- @abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.cpp \
- @abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.hpp \
- :
-- @ @MAKE@ -C @abs_this_builddir@/examples/cpp/tinyc
-+ @ $(MAKE) -C @abs_this_builddir@/examples/cpp/tinyc
-
- $(objdir)/.subc.g : $(srcdir)/subc.g $(objdir)/TinyCParserTokenTypes.txt @ANTLR_JAR@
- @ANTLRFLAGS="-glib `@CYGPATH_W@ $(_srcdir)/../tinyc/tinyc.g` -o `@CYGPATH_W@ $(thisdir)`" @ANTLR_COMPILE_CMD@ $(srcdir)/subc.g
-diff -Nur antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in
---- antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in 2006-11-01 23:37:17.000000000 +0200
-+++ antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in 2009-03-30 02:07:25.000000000 +0300
-@@ -77,7 +77,7 @@
- @ @CP@ $< $@
-
- @abs_this_builddir@/examples/java/tinyc/TinyCParserTokenTypes.txt :
-- @ @MAKE@ -C @abs_this_builddir@/examples/java/tinyc test
-+ @ $(MAKE) -C @abs_this_builddir@/examples/java/tinyc test
-
-
- ## How to generated *.java ..
-diff -Nur antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in
---- antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in 2006-11-01 23:37:18.000000000 +0200
-+++ antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in 2009-03-30 02:09:07.000000000 +0300
-@@ -61,11 +61,11 @@
- ## file resides. Therefore we are going to "make" the base
- ## grammar first and then copy required vocabulary over ..
- TinyCTokenTypes.txt :
-- @MAKE@ -C ../tinyc
-+ $(MAKE) -C ../tinyc
- @CP@ ../tinyc/$@ $@
-
- @abs_this_builddir@/examples/python/tinyc/%.py :
-- @MAKE@ -C ../tinyc
-+ $(MAKE) -C ../tinyc
-
- test :: test1
-
-diff -Nur antlr-2.7.7/Makefile.in antlr-2.7.7_patched/Makefile.in
---- antlr-2.7.7/Makefile.in 2006-11-01 23:37:18.000000000 +0200
-+++ antlr-2.7.7_patched/Makefile.in 2009-03-30 02:05:41.000000000 +0300
-@@ -31,7 +31,7 @@
-
- test clean distclean install ::
- @ if test -f examples/Makefile ; then \
-- @MAKE@ -C examples $@ ; \
-+ $(MAKE) -C examples $@ ; \
- fi
-
- # Rule to remove all objects, cores, ANTLR generated,
-diff -Nur antlr-2.7.7/scripts/config.make.in antlr-2.7.7_patched/scripts/config.make.in
---- antlr-2.7.7/scripts/config.make.in 2006-11-01 23:37:18.000000000 +0200
-+++ antlr-2.7.7_patched/scripts/config.make.in 2009-03-30 02:04:54.000000000 +0300
-@@ -47,9 +47,9 @@
- *) \
- if test -f "$${d}/Makefile" ; then \
- echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
-- echo ">> @MAKE@ -C $(subdir)/$${d} $@ " ; \
-+ echo ">> $(MAKE) -C $(subdir)/$${d} $@ " ; \
- echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
-- @MAKE@ -C "$$d" $@ || exit 1 ;\
-+ $(MAKE) -C "$$d" $@ || exit 1 ;\
- fi ; \
- ;; \
- esac ; \
diff --git a/dev-java/antlr/files/2.7.7-static-libs-fix.patch b/dev-java/antlr/files/2.7.7-static-libs-fix.patch
deleted file mode 100644
index 163aa3e97e5c..000000000000
--- a/dev-java/antlr/files/2.7.7-static-libs-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/scripts/antlr-config.in.old b/scripts/antlr-config.in
-index 75b94c6..adab1e6 100755
---- a/scripts/antlr-config.in.old
-+++ b/scripts/antlr-config.in
-@@ -19,7 +19,7 @@ Options:
- [--cflags]
- [--cxxflags]
- Libraries:
-- libantlr.a
-+ libantlr.so
- EOF
- exit $1
- }
-@@ -58,7 +58,7 @@ while test $# -gt 0; do
- libs="${libdir}/antlr.lib"
- ;;
- *)
-- libs="${libdir}/libantlr.a"
-+ libs="${libdir}/libantlr.so"
- ;;
- esac
- echo_libs=yes
diff --git a/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch b/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch
deleted file mode 100644
index a40fc60b16e6..000000000000
--- a/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 126414cf2731a3fe8a42393d0b41ce0060844b34 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 8 Aug 2015 03:46:00 +0200
-Subject: [PATCH] Fix CompositeGrammer.getIndirectDelegates for JDK 8
-
-https://github.com/antlr/antlr3/issues/151
----
- tool/src/main/java/org/antlr/tool/CompositeGrammar.java | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
-index bb15723..fc16f01 100644
---- a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
-+++ b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
-@@ -219,7 +219,9 @@ public class CompositeGrammar {
- public List<Grammar> getIndirectDelegates(Grammar g) {
- List<Grammar> direct = getDirectDelegates(g);
- List<Grammar> delegates = getDelegates(g);
-- delegates.removeAll(direct);
-+ if (direct != null) {
-+ delegates.removeAll(direct);
-+ }
- return delegates;
- }
-
---
-2.5.0
-