diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/antlr/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/antlr/files')
-rw-r--r-- | dev-java/antlr/files/2.7.7-gcc-4.3.patch | 11 | ||||
-rw-r--r-- | dev-java/antlr/files/2.7.7-gcc-4.4.patch | 10 | ||||
-rw-r--r-- | dev-java/antlr/files/2.7.7-makefixes.patch | 68 | ||||
-rw-r--r-- | dev-java/antlr/files/2.7.7-static-libs-fix.patch | 22 | ||||
-rw-r--r-- | dev-java/antlr/files/antlr-3.1.3-jdk-8.patch | 28 | ||||
-rw-r--r-- | dev-java/antlr/files/antlr-4.4-build.xml.patch | 20 | ||||
-rw-r--r-- | dev-java/antlr/files/antlr.pc.in | 9 |
7 files changed, 168 insertions, 0 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 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 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 new file mode 100644 index 000000000000..e1790ec4e0c6 --- /dev/null +++ b/dev-java/antlr/files/2.7.7-gcc-4.4.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..cb12752189a7 --- /dev/null +++ b/dev-java/antlr/files/2.7.7-makefixes.patch @@ -0,0 +1,68 @@ +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 new file mode 100644 index 000000000000..163aa3e97e5c --- /dev/null +++ b/dev-java/antlr/files/2.7.7-static-libs-fix.patch @@ -0,0 +1,22 @@ +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 new file mode 100644 index 000000000000..a40fc60b16e6 --- /dev/null +++ b/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch @@ -0,0 +1,28 @@ +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 + diff --git a/dev-java/antlr/files/antlr-4.4-build.xml.patch b/dev-java/antlr/files/antlr-4.4-build.xml.patch new file mode 100644 index 000000000000..1e64d30e9fc3 --- /dev/null +++ b/dev-java/antlr/files/antlr-4.4-build.xml.patch @@ -0,0 +1,20 @@ +--- build.xml.orig 2015-05-20 19:58:28.345000000 +0000 ++++ build.xml 2015-05-20 19:58:44.809000000 +0000 +@@ -11,8 +11,6 @@ + <property name="antlr3.version" value="3.5.2"/> + <property name="antlr3.jar.name" value="antlr-${antlr3.version}-complete-no-st3.jar"/> + <property name="antlr3.jar" value="${lib.dir}/${antlr3.jar.name}"/> +- <mkdir dir="${lib.dir}"/> +- <get src="http://www.antlr3.org/download/${antlr3.jar.name}" dest="${antlr3.jar}" skipexisting="true"/> + <path id="cp.antlr3" path="${antlr3.jar}"/> + + <property name="build.antlr3.dir" value="${build.dir}/generated-sources/antlr3" /> +@@ -23,8 +21,6 @@ + <property name="antlr4.version" value="4.3"/> + <property name="antlr4.jar.name" value="antlr-${antlr4.version}-complete.jar"/> + <property name="antlr4.jar" value="${lib.dir}/${antlr4.jar.name}"/> +- <mkdir dir="${lib.dir}"/> +- <get src="http://www.antlr.org/download/${antlr4.jar.name}" dest="${antlr4.jar}" skipexisting="true"/> + <path id="cp.antlr4" path="${antlr4.jar}"/> + + <property name="build.antlr4.dir" value="${build.dir}/generated-sources/antlr4" /> diff --git a/dev-java/antlr/files/antlr.pc.in b/dev-java/antlr/files/antlr.pc.in new file mode 100644 index 000000000000..fb5480637a90 --- /dev/null +++ b/dev-java/antlr/files/antlr.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ + + +Name: antlr +Description: ANother Tool for Language Recognition +Version: @VERSION@ +Libs: @libs@ |